nvme fixes for Linux 6.1
- initialize core quirks before calling nvme_init_subsystem (Pankaj Raghav) -----BEGIN PGP SIGNATURE----- iQI/BAABCgApFiEEgdbnc3r/njty3Iq9D55TZVIEUYMFAmOQnWwLHGhjaEBsc3Qu ZGUACgkQD55TZVIEUYPB9BAAmNjkq4F/OOHOXGyZKIbwq8ylFxtkRBD+608c3Woa juVI4+bXwhbG4k6h4TeXD2l2DZdjaKfNyG8ePD1GQ3KDU8unQqEUcFbuauW4vFYS 9FSeIvj2rIUGkiD0t5rNbxKHX4TZ2l8OB3sN1N3abuwZ34S211peCr09Tq80RnrR MOzvAB+RqUSaDyAqNfP+N9tvFLGQZXoruNogPY60b6NY6Z4n4QplvymIaU8wpFms 7lMAROLi9XQTBrrHkSivIDvxscy/HHtl5aYIzF7m/09svIzrYNu1VnqpnVl21kh8 5qb1FFbzJCxZvqcVWTC3Ozx19LFN4EZx3MvOGrWQ3wWGtpS1aYzIyol783bZe0w0 Oo6im77jKBocFHNB63vzwckD5vhfNJ9CPIRqBM1UGcU6NYTwOIl32PWAQn3etrW5 LElYtXdgRoXKMYho8sZAI8EGL3RPDbW/yba6t+VjvOYup2edp3A6iEjRk0HAcOeN vaJp1Rdu4DsXNPdJ00ctPABofD1jL8AwOrAz4ZLmCmnA83mf1UWcq2KpMBL6DBZi h61hDe4X88wko/3hWHfqwHVxeFuuIvPhceFjhFlGSygxw/kofs3y7JEHSq/uGTBx pmXsnsHIxhU/3G2PfM219iwogVuL1qLu7R4mr9TRK7km6SqAcDiL0nDypVy/gGRt zRE= =/4ct -----END PGP SIGNATURE----- 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
This commit is contained in:
Коммит
e18a9c18c3
|
@ -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));
|
||||
|
|
Загрузка…
Ссылка в новой задаче