diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2025-05-08 09:08:23 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-05-08 09:08:23 -0600 |
| commit | dd90905d5a8a15a6d4594d15fc8ed626587187ca (patch) | |
| tree | ba59b9104ee145e15b8a99f77472892c10e8db26 | |
| parent | block: remove test of incorrect io priority level (diff) | |
| parent | nvme: unblock ctrl state transition for firmware update (diff) | |
| download | wireguard-linux-dd90905d5a8a15a6d4594d15fc8ed626587187ca.tar.xz wireguard-linux-dd90905d5a8a15a6d4594d15fc8ed626587187ca.zip | |
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
| -rw-r--r-- | drivers/nvme/host/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index eb6ea8acb3cc..ac53629fce68 100644 --- 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); |