Commit 859c73d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents af145500 e18a9c18

drivers/nvme/host/core.c

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