From d3659794fe0a76541b07ffc80acf9810e978ee86 Mon Sep 17 00:00:00 2001 From: Alan Date: Mon, 8 Jan 2007 12:07:25 +0000 Subject: [PATCH] --- yaml --- r: 47344 b: refs/heads/master c: 904dbd1307100edc12e2f98dd12b2338f1914f5b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/ahci.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 9053da36c048..d18f7ed02677 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4112e16a7c606a80810d22d55bfc742eaa61fecb +refs/heads/master: 904dbd1307100edc12e2f98dd12b2338f1914f5b diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c index 32cfaa89dc7c..ca53d5a9c0c5 100644 --- a/trunk/drivers/ata/ahci.c +++ b/trunk/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; }