diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:44 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:44 -0400 |
commit | f974b196f58fe042c7b2b4c0ee15d5a6112dbf40 (patch) | |
tree | b717d35a8d6b3c60aa7a95ca1a1002918cb678a1 /drivers/ide/ide-io.c | |
parent | a9587fd8c48415cc93fef7f4ba7748a5d3477e7b (diff) |
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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 4a79d28600f5..a4aa4bf84738 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) | |||
141 | kfree(cmd); | 141 | kfree(cmd); |
142 | } | 142 | } |
143 | 143 | ||
144 | int ide_complete_rq(ide_drive_t *drive, int error) | 144 | int ide_complete_rq(ide_drive_t *drive, int error, unsigned int nr_bytes) |
145 | { | 145 | { |
146 | ide_hwif_t *hwif = drive->hwif; | 146 | ide_hwif_t *hwif = drive->hwif; |
147 | struct request *rq = hwif->rq; | 147 | struct request *rq = hwif->rq; |
148 | int rc; | 148 | int rc; |
149 | 149 | ||
150 | rc = blk_end_request(rq, error, blk_rq_bytes(rq)); | 150 | rc = blk_end_request(rq, error, nr_bytes); |
151 | if (rc == 0) | 151 | if (rc == 0) |
152 | hwif->rq = NULL; | 152 | hwif->rq = NULL; |
153 | 153 | ||
@@ -164,7 +164,7 @@ void ide_kill_rq(ide_drive_t *drive, struct request *rq) | |||
164 | 164 | ||
165 | if ((media == ide_floppy || media == ide_tape) && drv_req) { | 165 | if ((media == ide_floppy || media == ide_tape) && drv_req) { |
166 | rq->errors = 0; | 166 | rq->errors = 0; |
167 | ide_complete_rq(drive, 0); | 167 | ide_complete_rq(drive, 0, blk_rq_bytes(rq)); |
168 | } else { | 168 | } else { |
169 | if (media == ide_tape) | 169 | if (media == ide_tape) |
170 | rq->errors = IDE_DRV_ERROR_GENERAL; | 170 | rq->errors = IDE_DRV_ERROR_GENERAL; |
@@ -312,7 +312,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive, | |||
312 | printk("%s: DRIVE_CMD (null)\n", drive->name); | 312 | printk("%s: DRIVE_CMD (null)\n", drive->name); |
313 | #endif | 313 | #endif |
314 | rq->errors = 0; | 314 | rq->errors = 0; |
315 | ide_complete_rq(drive, 0); | 315 | ide_complete_rq(drive, 0, blk_rq_bytes(rq)); |
316 | 316 | ||
317 | return ide_stopped; | 317 | return ide_stopped; |
318 | } | 318 | } |