Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 06b14bc9a1d4..d4136908f916 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -449,7 +449,6 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
         ide_hwif_t *hwif = drive->hwif;
         const struct ide_dma_ops *dma_ops = hwif->dma_ops;
         struct ide_cmd *cmd = &hwif->cmd;
-        struct request *rq;
         ide_startstop_t ret = ide_stopped;
 
         /*
@@ -487,14 +486,10 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
         ide_dma_off_quietly(drive);
 
         /*
-         * un-busy drive etc and make sure request is sane
+         * make sure request is sane
          */
-        rq = hwif->rq;
-        if (rq) {
-                hwif->rq = NULL;
-                rq->errors = 0;
-                ide_requeue_and_plug(drive, rq);
-        }
+        if (hwif->rq)
+                hwif->rq->errors = 0;
         return ret;
 }