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>

2 files changed, 7 insertions, 5 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)
                 kfree(cmd);
 }
 
-void ide_complete_rq(ide_drive_t *drive, int error)
+int ide_complete_rq(ide_drive_t *drive, int error)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct request *rq = hwif->rq;
+        int rc;
 
-        hwif->rq = NULL;
+        rc = blk_end_request(rq, error, blk_rq_bytes(rq));
+        if (rc == 0)
+                hwif->rq = NULL;
 
-        if (unlikely(blk_end_request(rq, error, blk_rq_bytes(rq))))
-                BUG();
+        return rc;
 }
 EXPORT_SYMBOL(ide_complete_rq);
 
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 32369d5797de..bb62bfaf02e0 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1166,7 +1166,7 @@ extern int ide_devset_execute(ide_drive_t *drive,
                               const struct ide_devset *setting, int arg);
 
 void ide_complete_cmd(ide_drive_t *, struct ide_cmd *, u8, u8);
-void ide_complete_rq(ide_drive_t *, int);
+int ide_complete_rq(ide_drive_t *, int);
 
 void ide_tf_dump(const char *, struct ide_taskfile *);