Commit dd90905d authored by Jens Axboe's avatar Jens Axboe
Browse files

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
parents c0d0a9ff 650415fc

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -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);