diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 5aed79ed458661cfacd5e60d505e3aff39f458b3..1eb3f5cce556194580c69951816e0cc968bc8a5a 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1606,8 +1606,11 @@ int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t actio
 	spin_lock_irqsave(&ide_lock, flags);
 	if (action == ide_preempt)
 		hwgroup->rq = NULL;
-	__elv_add_request(drive->queue, rq, where, 0);
-	ide_do_request(hwgroup, IDE_NO_IRQ);
+	__elv_add_request(drive->queue, rq, where, 1);
+	__generic_unplug_device(drive->queue);
+	/* the queue is stopped so it won't be plugged+unplugged */
+	if (blk_pm_resume_request(rq))
+		do_ide_request(drive->queue);
 	spin_unlock_irqrestore(&ide_lock, flags);
 
 	err = 0;