diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-29 16:07:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-29 16:07:35 -0700 |
| commit | 8a91f86f3e9e9608210166c70aaad4919018c0e7 (patch) | |
| tree | 1d0e0e3a909fc8634410275c2b575130ecdc8138 | |
| parent | Merge tag 'drm-fixes-2022-07-30' of git://anongit.freedesktop.org/drm/drm (diff) | |
| parent | Merge tag 'nvme-5.19-2022-07-27' of git://git.infradead.org/nvme into block-5.19 (diff) | |
| download | wireguard-linux-8a91f86f3e9e9608210166c70aaad4919018c0e7.tar.xz wireguard-linux-8a91f86f3e9e9608210166c70aaad4919018c0e7.zip | |
Merge tag 'block-5.19-2022-07-29' of git://git.kernel.dk/linux-block
Pull block fix from Jens Axboe:
"Just a single fix for NVMe, yet another quirk addition"
* tag 'block-5.19-2022-07-29' of git://git.kernel.dk/linux-block:
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 58c72d55769a..73d9fcba3b1c 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), |