summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2012-09-10 02:09:04 +0200
committerJeff Garzik <jgarzik@redhat.com>2012-09-13 06:23:12 +0200
commit1fefb8fdc6562057a0e4e4542f3d4323981c9686 (patch)
tree0d8e0bcc27edf48808c7e952abd9bb927d754595 /drivers/ata
parentMerge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 (diff)
downloadlinux-1fefb8fdc6562057a0e4e4542f3d4323981c9686.tar.xz
linux-1fefb8fdc6562057a0e4e4542f3d4323981c9686.zip
ahci: Add JMicron 362 device IDs
The JMicron JMB362 controller supports AHCI only, but some revisions use the IDE class code. These need to be matched by device ID. These additions have apparently been included by QNAP in their NAS devices using these controllers. References: http://bugs.debian.org/634180 Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/ahci.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 50d5dea0ff59..c3f52eb97fca 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -268,6 +268,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
/* JMicron 360/1/3/5/6, match class to avoid IDE function */
{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci_ign_iferr },
+ /* JMicron 362B and 362C have an AHCI function with IDE class code */
+ { PCI_VDEVICE(JMICRON, 0x2362), board_ahci_ign_iferr },
+ { PCI_VDEVICE(JMICRON, 0x236f), board_ahci_ign_iferr },
/* ATI */
{ PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 */