Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index eb2181a6a11c..f9daffd7d0e3 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -7,6 +7,7 @@
 #include <linux/delay.h>
 #include <linux/ide.h>
 #include <linux/scatterlist.h>
+#include <linux/gfp.h>
 
 #include <scsi/scsi.h>
 
@@ -263,8 +264,8 @@ void ide_retry_pc(ide_drive_t *drive)
          * of it.  The failed command will be retried after sense data
          * is acquired.
          */
-        blk_requeue_request(failed_rq->q, failed_rq);
         drive->hwif->rq = NULL;
+        ide_requeue_and_plug(drive, failed_rq);
         if (ide_queue_sense_rq(drive, pc)) {
                 blk_start_request(failed_rq);
                 ide_complete_rq(drive, -EIO, blk_rq_bytes(failed_rq));