diff options
| author | Jens Axboe <axboe@kernel.dk> | 2022-12-07 18:55:27 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-12-07 18:55:27 +0300 |
| commit | e18a9c18c38f523ae45416e2b75ed4ddf8ad107b (patch) | |
| tree | 36f4817d7117543f1b8fe88d9e35151d9cfea491 | |
| parent | d0f411c0b9bdef85f647e15a2fcc790b29891f2c (diff) | |
| parent | 6f2d71524bcfdeb1fcbd22a4a92a5b7b161ab224 (diff) | |
| download | linux-e18a9c18c38f523ae45416e2b75ed4ddf8ad107b.tar.xz | |
Merge tag 'nvme-6.1-2022-12-07' of git://git.infradead.org/nvme into block-6.1
Pull NVMe fix from Christoph:
"nvme fixes for Linux 6.1
- initialize core quirks before calling nvme_init_subsystem
(Pankaj Raghav)"
* tag 'nvme-6.1-2022-12-07' of git://git.infradead.org/nvme:
nvme initialize core quirks before calling nvme_init_subsystem
| -rw-r--r-- | drivers/nvme/host/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 69e333922bea..7e3893d06bab 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3095,10 +3095,6 @@ static int nvme_init_identify(struct nvme_ctrl *ctrl) if (!ctrl->identified) { unsigned int i; - ret = nvme_init_subsystem(ctrl, id); - if (ret) - goto out_free; - /* * Check for quirks. Quirk can depend on firmware version, * so, in principle, the set of quirks present can change @@ -3111,6 +3107,10 @@ static int nvme_init_identify(struct nvme_ctrl *ctrl) if (quirk_matches(id, &core_quirks[i])) ctrl->quirks |= core_quirks[i].quirks; } + + ret = nvme_init_subsystem(ctrl, id); + if (ret) + goto out_free; } memcpy(ctrl->subsys->firmware_rev, id->fr, sizeof(ctrl->subsys->firmware_rev)); |