diff options
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r-- | drivers/ide/ide-io.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 28ac463dde1c..4a79d28600f5 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -141,15 +141,17 @@ 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 | void ide_complete_rq(ide_drive_t *drive, int error) | 144 | int ide_complete_rq(ide_drive_t *drive, int error) |
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 | 149 | ||
149 | hwif->rq = NULL; | 150 | rc = blk_end_request(rq, error, blk_rq_bytes(rq)); |
151 | if (rc == 0) | ||
152 | hwif->rq = NULL; | ||
150 | 153 | ||
151 | if (unlikely(blk_end_request(rq, error, blk_rq_bytes(rq)))) | 154 | return rc; |
152 | BUG(); | ||
153 | } | 155 | } |
154 | EXPORT_SYMBOL(ide_complete_rq); | 156 | EXPORT_SYMBOL(ide_complete_rq); |
155 | 157 | ||