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

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
parents d0f411c0 6f2d7152

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));