diff options
author | Jens Axboe <axboe@kernel.dk> | 2023-05-26 17:46:01 +0200 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2023-05-26 17:46:01 +0200 |
commit | 9491d01fbc550d123d72bf1cd7a0985508a9c469 (patch) | |
tree | f55159aecca2ffe0d21018f93480d1a10a2cfaaf | |
parent | block: make bio_check_eod work for zero sized devices (diff) | |
parent | NVMe: Add MAXIO 1602 to bogus nid list. (diff) | |
download | linux-9491d01fbc550d123d72bf1cd7a0985508a9c469.tar.xz linux-9491d01fbc550d123d72bf1cd7a0985508a9c469.zip |
Merge tag 'nvme-6.4-2023-05-26' of git://git.infradead.org/nvme into block-6.4
Pull NVMe fix from Keith:
"nvme fixes for 6.4
One nvme quirk (Tatsuki)"
* tag 'nvme-6.4-2023-05-26' of git://git.infradead.org/nvme:
NVMe: Add MAXIO 1602 to bogus nid list.
-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 32244582fdb0..492f319ebdf3 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -3424,6 +3424,8 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1e4B, 0x1202), /* MAXIO MAP1202 */ .driver_data = NVME_QUIRK_BOGUS_NID, }, + { PCI_DEVICE(0x1e4B, 0x1602), /* MAXIO MAP1602 */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1cc1, 0x5350), /* ADATA XPG GAMMIX S50 */ .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1dbe, 0x5236), /* ADATA XPG GAMMIX S70 */ |