Merge tag 'block-6.1-2022-12-08' of git://git.kernel.dk/linux

859c73d4 · Linus Torvalds <[email protected]> · 2022-12-08 15:53:39 -08:00

Pull block fix from Jens Axboe:
 "A small fix for initializing the NVMe quirks before initializing the
  subsystem"

* tag 'block-6.1-2022-12-08' of git://git.kernel.dk/linux:
  nvme initialize core quirks before calling nvme_init_subsystem

Commit: 859c73d439cd9113333a75e683e9433c0092990d
Parents: af145500 · e18a9c18

Merge commit. Changes below are compared with the first parent: af145500.

Changes

1 files changed · +4 −4

File	Status	Add	Del	Content
drivers/nvme/host/core.c	modified	+4	−4	View file

drivers/nvme/host/core.c

View file

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 69e3339..7e3893d 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));