Commit f7ca1ae3 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-6.3' of git://git.infradead.org/nvme into block-6.3 

Pull NVMe fix from Christoph.

* 'nvme-6.3' of git://git.infradead.org/nvme:
  nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD
parents 3723091e 74391b3e

drivers/nvme/host/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -3443,6 +3443,8 @@ static const struct pci_device_id nvme_id_table[] = { 
	{ PCI_DEVICE(0x1d97, 0x2269), /* Lexar NM760 */

		.driver_data = NVME_QUIRK_BOGUS_NID |

				NVME_QUIRK_IGNORE_DEV_SUBNQN, },

	{ PCI_DEVICE(0x10ec, 0x5763), /* TEAMGROUP T-FORCE CARDEA ZERO Z330 SSD */

		.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),