projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm
[linux-2.6-microblaze.git]
/
drivers
/
ide
/
ide-floppy.c
diff --git
a/drivers/ide/ide-floppy.c
b/drivers/ide/ide-floppy.c
index
8b3f204
..
fefbdfc
100644
(file)
--- a/
drivers/ide/ide-floppy.c
+++ b/
drivers/ide/ide-floppy.c
@@
-293,7
+293,7
@@
out_end:
drive->failed_pc = NULL;
if (blk_fs_request(rq) == 0 && rq->errors == 0)
rq->errors = -EIO;
- ide_complete_rq(drive, -EIO,
ide
_rq_bytes(rq));
+ ide_complete_rq(drive, -EIO,
blk
_rq_bytes(rq));
return ide_stopped;
}