1 files changed, 8 insertions, 12 deletions

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index d7c33f9361aa..8dcf5a960951 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1543,15 +1543,10 @@ static void nvme_disable_io_queues(struct nvme_dev *dev)
                 reinit_completion(&dev->ioq_wait);
  retry:
                 timeout = ADMIN_TIMEOUT;
-                for (; i > 0; i--) {
-                        struct nvme_queue *nvmeq = dev->queues[i];
-
-                        if (!pass)
-                                nvme_suspend_queue(nvmeq);
-                        if (nvme_delete_queue(nvmeq, opcode))
+                for (; i > 0; i--, sent++)
+                        if (nvme_delete_queue(dev->queues[i], opcode))
                                 break;
-                        ++sent;
-                }
+
                 while (sent--) {
                         timeout = wait_for_completion_io_timeout(&dev->ioq_wait, timeout);
                         if (timeout == 0)
@@ -1693,11 +1688,12 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
                 nvme_stop_queues(&dev->ctrl);
                 csts = readl(dev->bar + NVME_REG_CSTS);
         }
+
+        for (i = dev->queue_count - 1; i > 0; i--)
+                nvme_suspend_queue(dev->queues[i]);
+
         if (csts & NVME_CSTS_CFS || !(csts & NVME_CSTS_RDY)) {
-                for (i = dev->queue_count - 1; i >= 0; i--) {
-                        struct nvme_queue *nvmeq = dev->queues[i];
-                        nvme_suspend_queue(nvmeq);
-                }
+                nvme_suspend_queue(dev->queues[0]);
         } else {
                 nvme_disable_io_queues(dev);
                 nvme_disable_admin_queue(dev, shutdown);