Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-4
+4
-4
drivers/nvme/host/core.c
+4
-4
drivers/nvme/host/core.c
···
3095
3095
if (!ctrl->identified) {
3096
3096
unsigned int i;
3097
3097
3098
-
ret = nvme_init_subsystem(ctrl, id);
3099
-
if (ret)
3100
-
goto out_free;
3101
-
3102
3098
/*
3103
3099
* Check for quirks. Quirk can depend on firmware version,
3104
3100
* so, in principle, the set of quirks present can change
···
3107
3111
if (quirk_matches(id, &core_quirks[i]))
3108
3112
ctrl->quirks |= core_quirks[i].quirks;
3109
3113
}
3114
+
3115
+
ret = nvme_init_subsystem(ctrl, id);
3116
+
if (ret)
3117
+
goto out_free;
3110
3118
}
3111
3119
memcpy(ctrl->subsys->firmware_rev, id->fr,
3112
3120
sizeof(ctrl->subsys->firmware_rev));