summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-io.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 12:46:44 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 12:46:44 +0100
commitf974b196f58fe042c7b2b4c0ee15d5a6112dbf40 (patch)
treeb717d35a8d6b3c60aa7a95ca1a1002918cb678a1 /drivers/ide/ide-io.c
parenta9587fd8c48415cc93fef7f4ba7748a5d3477e7b (diff)
downloadop-kernel-dev-f974b196f58fe042c7b2b4c0ee15d5a6112dbf40.zip
op-kernel-dev-f974b196f58fe042c7b2b4c0ee15d5a6112dbf40.tar.gz
ide: pass number of bytes to complete to ide_complete_rq()
There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r--drivers/ide/ide-io.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 4a79d28..a4aa4bf 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -141,13 +141,13 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
kfree(cmd);
}
-int ide_complete_rq(ide_drive_t *drive, int error)
+int ide_complete_rq(ide_drive_t *drive, int error, unsigned int nr_bytes)
{
ide_hwif_t *hwif = drive->hwif;
struct request *rq = hwif->rq;
int rc;
- rc = blk_end_request(rq, error, blk_rq_bytes(rq));
+ rc = blk_end_request(rq, error, nr_bytes);
if (rc == 0)
hwif->rq = NULL;
@@ -164,7 +164,7 @@ void ide_kill_rq(ide_drive_t *drive, struct request *rq)
if ((media == ide_floppy || media == ide_tape) && drv_req) {
rq->errors = 0;
- ide_complete_rq(drive, 0);
+ ide_complete_rq(drive, 0, blk_rq_bytes(rq));
} else {
if (media == ide_tape)
rq->errors = IDE_DRV_ERROR_GENERAL;
@@ -312,7 +312,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
printk("%s: DRIVE_CMD (null)\n", drive->name);
#endif
rq->errors = 0;
- ide_complete_rq(drive, 0);
+ ide_complete_rq(drive, 0, blk_rq_bytes(rq));
return ide_stopped;
}
OpenPOWER on IntegriCloud