diff options
| author | Jens Axboe <axboe@kernel.dk> | 2022-07-27 10:03:40 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-07-27 10:03:40 -0600 |
| commit | eda3953b6a805d6df87a4c51058493ec88bfc622 (patch) | |
| tree | e368d405febd9cbc15720d15f68959d69735c7bb | |
| parent | 82e094f7bd988c02df27f8c8d81af8f750660b2a (diff) | |
| parent | d6c52fa3e955b97f8eb3ac824d2a3e0af147b3ce (diff) | |
| download | linux-gpio-intel-eda3953b6a805d6df87a4c51058493ec88bfc622.tar.gz | |
Merge tag 'nvme-5.19-2022-07-27' of git://git.infradead.org/nvme into block-5.19
Pull NVMe fix from Christoph:
"nvme fix for Linux 5.19
- yet another duplicate ID quirk (Tobias Gruetzmacher)"
* tag 'nvme-5.19-2022-07-27' of git://git.infradead.org/nvme:
nvme-pci: Crucial P2 has bogus namespace ids
| -rw-r--r-- | drivers/nvme/host/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 58c72d55769a1f..73d9fcba3b1c08 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -3515,6 +3515,8 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1e49, 0x0041), /* ZHITAI TiPro7000 NVMe SSD */ .driver_data = NVME_QUIRK_NO_DEEPEST_PS, }, + { PCI_DEVICE(0xc0a9, 0x540a), /* Crucial P2 */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061), .driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065), |