aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-io.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:44 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:44 -0400
commita9587fd8c48415cc93fef7f4ba7748a5d3477e7b (patch)
tree310e6d5859c65a4b00395a5922e834defde06bcd /drivers/ide/ide-io.c
parent89f78b3261f7e331e41753ea2459fbb9b60a6f7a (diff)
ide: remove BUG() from ide_complete_rq()
It is no longer needed so remove it, also while at it dequeue the request only on blk_end_request() success and make ide_complete_rq() return an error value. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r--drivers/ide/ide-io.c10
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
144void ide_complete_rq(ide_drive_t *drive, int error) 144int 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}
154EXPORT_SYMBOL(ide_complete_rq); 156EXPORT_SYMBOL(ide_complete_rq);
155 157