2 files changed, 4 insertions, 7 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 2874c3d703a9..8a894fa37b53 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -269,7 +269,7 @@ void ide_retry_pc(ide_drive_t *drive)
         blk_requeue_request(failed_rq->q, failed_rq);
         drive->hwif->rq = NULL;
         if (ide_queue_sense_rq(drive, pc)) {
-                blkdev_dequeue_request(failed_rq);
+                blk_start_request(failed_rq);
                 ide_complete_rq(drive, -EIO, blk_rq_bytes(failed_rq));
         }
 }
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index abda7337b3f4..e4e3a0e3201e 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -519,11 +519,8 @@ repeat:
                  * we know that the queue isn't empty, but this can happen
                  * if the q->prep_rq_fn() decides to kill a request
                  */
-                if (!rq) {
-                        rq = elv_next_request(drive->queue);
-                        if (rq)
-                                blkdev_dequeue_request(rq);
-                }
+                if (!rq)
+                        rq = blk_fetch_request(drive->queue);
 
                 spin_unlock_irq(q->queue_lock);
                 spin_lock_irq(&hwif->lock);
@@ -536,7 +533,7 @@ repeat:
                 /*
                  * Sanity: don't accept a request that isn't a PM request
                  * if we are currently power managed. This is very important as
-                 * blk_stop_queue() doesn't prevent the elv_next_request()
+                 * blk_stop_queue() doesn't prevent the blk_fetch_request()
                  * above to return us whatever is in the queue. Since we call
                  * ide_do_request() ourselves, we end up taking requests while
                  * the queue is blocked...