summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2023-04-14 06:29:00 -0600
committerJens Axboe <axboe@kernel.dk>2023-04-14 06:29:00 -0600
commitf7ca1ae32bd89ab035568c63b4443eb55420b423 (patch)
treed6769505de0e3a9c9db4e4add2bb5134fc4f4051
parent3723091ea1884d599cc8b8bf719d6f42e8d4d8b1 (diff)
parent74391b3e69855e7dd65a9cef36baf5fc1345affd (diff)
downloadlinux-stable-f7ca1ae32bd89ab035568c63b4443eb55420b423.tar.gz
linux-stable-f7ca1ae32bd89ab035568c63b4443eb55420b423.tar.bz2
linux-stable-f7ca1ae32bd89ab035568c63b4443eb55420b423.zip
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
-rw-r--r--drivers/nvme/host/pci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 282d808400c5..cd7873de3121 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -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),