Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6] / drivers / ata / ata_generic.c

diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 0b5b515ae159854337c61e285fa865decd1e36b0..75a406f5e6945525d4799bc44de7ccf6e1552feb 100644 (file)
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -120,7 +120,6 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id
 {
        u16 command;
        static const struct ata_port_info info = {
-               .sht = &generic_sht,
                .flags = ATA_FLAG_SLAVE_POSS,
                .pio_mask = 0x1f,
                .mwdma_mask = 0x07,
@@ -151,9 +150,15 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id
                return -ENODEV;
 
        if (dev->vendor == PCI_VENDOR_ID_AL)
-               ata_pci_clear_simplex(dev);
+               ata_pci_bmdma_clear_simplex(dev);
 
-       return ata_pci_init_one(dev, ppi);
+       if (dev->vendor == PCI_VENDOR_ID_ATI) {
+               int rc = pcim_enable_device(dev);
+               if (rc < 0)
+                       return rc;
+               pcim_pin_device(dev);
+       }
+       return ata_pci_sff_init_one(dev, ppi, &generic_sht, NULL);
 }
 
 static struct pci_device_id ata_generic[] = {