|
@@ -2196,7 +2196,11 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
|
|
|
if (!dead) {
|
|
|
if (shutdown)
|
|
|
nvme_wait_freeze_timeout(&dev->ctrl, NVME_IO_TIMEOUT);
|
|
|
+ }
|
|
|
+
|
|
|
+ nvme_stop_queues(&dev->ctrl);
|
|
|
|
|
|
+ if (!dead) {
|
|
|
/*
|
|
|
* If the controller is still alive tell it to stop using the
|
|
|
* host memory buffer. In theory the shutdown / reset should
|
|
@@ -2205,11 +2209,6 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
|
|
|
*/
|
|
|
if (dev->host_mem_descs)
|
|
|
nvme_set_host_mem(dev, 0);
|
|
|
-
|
|
|
- }
|
|
|
- nvme_stop_queues(&dev->ctrl);
|
|
|
-
|
|
|
- if (!dead) {
|
|
|
nvme_disable_io_queues(dev);
|
|
|
nvme_disable_admin_queue(dev, shutdown);
|
|
|
}
|