diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 32cfaa89dc7ce2462d7c4a4f7915c2c4a6ff6cb6..ca53d5a9c0c571022097b6fdcea886b007e19f99 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) if (!printed_version++) dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); - /* JMicron-specific fixup: make sure we're in AHCI mode */ - /* This is protected from races with ata_jmicron by the pci probe - locking */ if (pdev->vendor == PCI_VENDOR_ID_JMICRON) { - /* AHCI enable, AHCI on function 0 */ - pci_write_config_byte(pdev, 0x41, 0xa1); - /* Function 1 is the PATA controller */ + /* Function 1 is the PATA controller except on the 368, where + we are not AHCI anyway */ if (PCI_FUNC(pdev->devfn)) return -ENODEV; }