Merge tag 'nvme-6.15-2025-05-08' of git://git.infradead.org/nvme into…

… block-6.15 Pull NVMe fix from Christoph: "nvme fixes for linux 6.15 - unblock ctrl state transition for firmware update (Daniel Wagner)" * tag 'nvme-6.15-2025-05-08' of git://git.infradead.org/nvme: nvme: unblock ctrl state transition for firmware update
mariux64 · May 8, 2025 · dd90905 · dd90905
2 parents c0d0a9f + 650415f
commit dd90905
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
@@ -4493,7 +4493,8 @@ static void nvme_fw_act_work(struct work_struct *work)
 		msleep(100);
 	}
 
-	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_LIVE))
+	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_CONNECTING) ||
+	    !nvme_change_ctrl_state(ctrl, NVME_CTRL_LIVE))
 		return;
 
 	nvme_unquiesce_io_queues(ctrl);