aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/ahci.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/ahci.c')
-rw-r--r--drivers/ata/ahci.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 32cfaa89dc7c..ca53d5a9c0c5 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1685,13 +1685,9 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
1685 if (!printed_version++) 1685 if (!printed_version++)
1686 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); 1686 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
1687 1687
1688 /* JMicron-specific fixup: make sure we're in AHCI mode */
1689 /* This is protected from races with ata_jmicron by the pci probe
1690 locking */
1691 if (pdev->vendor == PCI_VENDOR_ID_JMICRON) { 1688 if (pdev->vendor == PCI_VENDOR_ID_JMICRON) {
1692 /* AHCI enable, AHCI on function 0 */ 1689 /* Function 1 is the PATA controller except on the 368, where
1693 pci_write_config_byte(pdev, 0x41, 0xa1); 1690 we are not AHCI anyway */
1694 /* Function 1 is the PATA controller */
1695 if (PCI_FUNC(pdev->devfn)) 1691 if (PCI_FUNC(pdev->devfn))
1696 return -ENODEV; 1692 return -ENODEV;
1697 } 1693 }