Sophie

Sophie

distrib > Mageia > 2 > i586 > by-pkgid > 4b72850036257b2db627c2b9bbb2d6c0 > files > 6

kernel-vserver-3.4.69-1.mga2.src.rpm

commit 1fefb8fdc6562057a0e4e4542f3d4323981c9686
Author: Ben Hutchings <ben@decadent.org.uk>
Date:   Mon Sep 10 01:09:04 2012 +0100

    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>

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 50d5dea..c3f52eb 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -280,6 +280,9 @@ static const struct pci_device_id ahci_p
 	/* 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 */