Commit 8a91f86f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e65c6a46 eda3953b

drivers/nvme/host/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -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),