[PATCH] nvme: fixup boot failure on nvme-pci

[hare at kernel.org]

From: Hannes Reinecke <hare at kernel.org>

Commit 62baf70c3274 caused the ANA log page to be re-read, even on systems
where the ANA is not supported.

Fixes: 62baf70c3274 ("nvme: re-read ANA log page after ns scan completes")

Signed-off-by: Hannes Reinecke <hare at kernel.org>
Tested-by: Srikanth Aithal <sraithal at amd.com>
---
 drivers/nvme/host/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index b502ac07483b..eb6ea8acb3cc 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -4300,7 +4300,7 @@ static void nvme_scan_work(struct work_struct *work)
 	if (test_bit(NVME_AER_NOTICE_NS_CHANGED, &ctrl->events))
 		nvme_queue_scan(ctrl);
 #ifdef CONFIG_NVME_MULTIPATH
-	else
+	else if (ctrl->ana_log_buf)
 		/* Re-read the ANA log page to not miss updates */
 		queue_work(nvme_wq, &ctrl->ana_work);
 #endif
-- 
2.35.3