aboutsummaryrefslogtreecommitdiff
path: root/drivers/ide/ide-devsets.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-06-23 11:27:27 +0000
committerDavid S. Miller <davem@davemloft.net>2009-06-25 23:57:16 -0700
commit5e955245d6cf49c5ed26c7add7392ff5a6762bf4 (patch)
tree9cf243dd76059d9d218170cde5998f5a334b6a36 /drivers/ide/ide-devsets.c
parent789547508f22e482825f52f813b59680408ec2c7 (diff)
downloadlinux-stericsson-5e955245d6cf49c5ed26c7add7392ff5a6762bf4.tar.gz
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-devsets.c')
-rw-r--r--drivers/ide/ide-devsets.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-devsets.c b/drivers/ide/ide-devsets.c
index 5bf958e5b1d5..1099bf7cf968 100644
--- a/drivers/ide/ide-devsets.c
+++ b/drivers/ide/ide-devsets.c
@@ -183,6 +183,6 @@ ide_startstop_t ide_do_devset(ide_drive_t *drive, struct request *rq)
err = setfunc(drive, *(int *)&rq->cmd[1]);
if (err)
rq->errors = err;
- ide_complete_rq(drive, err, ide_rq_bytes(rq));
+ ide_complete_rq(drive, err, blk_rq_bytes(rq));
return ide_stopped;
}