diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-06-23 11:27:27 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-25 23:57:16 -0700 |
| commit | 5e955245d6cf49c5ed26c7add7392ff5a6762bf4 (patch) | |
| tree | 9cf243dd76059d9d218170cde5998f5a334b6a36 /drivers/ide/ide-floppy.c | |
| parent | 789547508f22e482825f52f813b59680408ec2c7 (diff) | |
| download | blackbird-op-linux-5e955245d6cf49c5ed26c7add7392ff5a6762bf4.tar.gz blackbird-op-linux-5e955245d6cf49c5ed26c7add7392ff5a6762bf4.zip | |
ide: always kill the whole request on error
* Use blk_rq_bytes() instead of obsolete ide_rq_bytes() in ide_kill_rq()
and ide_floppy_do_request() for failed requests.
[ bugfix part ]
* Use blk_rq_bytes() instead of obsolete ide_rq_bytes() in ide_do_devset()
and ide_complete_drive_reset(). Then remove ide_rq_bytes().
[ cleanup part ]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide/ide-floppy.c')
| -rw-r--r-- | drivers/ide/ide-floppy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 8b3f204f7d73..fefbdfc8db06 100644 --- 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; } |
