1 files changed, 16 insertions, 7 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 63627be0811a..5aeaca24a28f 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1159,18 +1159,27 @@ static void drive_rq_insert_work(struct work_struct *work)
         ide_drive_t *drive = container_of(work, ide_drive_t, rq_work);
         ide_hwif_t *hwif = drive->hwif;
         struct request *rq;
+        blk_status_t ret;
         LIST_HEAD(list);
 
-        spin_lock_irq(&hwif->lock);
-        if (!list_empty(&drive->rq_list))
-                list_splice_init(&drive->rq_list, &list);
-        spin_unlock_irq(&hwif->lock);
+        blk_mq_quiesce_queue(drive->queue);
 
-        while (!list_empty(&list)) {
-                rq = list_first_entry(&list, struct request, queuelist);
+        ret = BLK_STS_OK;
+        spin_lock_irq(&hwif->lock);
+        while (!list_empty(&drive->rq_list)) {
+                rq = list_first_entry(&drive->rq_list, struct request, queuelist);
                 list_del_init(&rq->queuelist);
-                blk_execute_rq_nowait(drive->queue, rq->rq_disk, rq, true, NULL);
+
+                spin_unlock_irq(&hwif->lock);
+                ret = ide_issue_rq(drive, rq, true);
+                spin_lock_irq(&hwif->lock);
         }
+        spin_unlock_irq(&hwif->lock);
+
+        blk_mq_unquiesce_queue(drive->queue);
+
+        if (ret != BLK_STS_OK)
+                kblockd_schedule_work(&drive->rq_work);
 }
 
 static const u8 ide_hwif_to_major[] =