diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-04-14 14:29:00 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-04-14 14:29:00 +0200 |
| commit | f7ca1ae32bd89ab035568c63b4443eb55420b423 (patch) | |
| tree | d6769505de0e3a9c9db4e4add2bb5134fc4f4051 | |
| parent | block: don't set GD_NEED_PART_SCAN if scan partition failed (diff) | |
| parent | nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD (diff) | |
| download | linux-f7ca1ae32bd89ab035568c63b4443eb55420b423.tar.xz linux-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.c | 2 |
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), |