diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-05-10 00:24:09 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-05-10 00:24:09 +0200 |
| commit | 1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5 (patch) | |
| tree | 3f143311afca5e316afd06c2fc4f7d73b19cdcf0 /drivers/ata/ata_generic.c | |
| parent | [ARM] 5033/1: Unbreak corgi_ssp by registering ssp drivers earlier. (diff) | |
| parent | [ARM] Orion: clean up addr-map.c after window setting code purge (diff) | |
| download | linux-1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5.tar.xz linux-1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
Diffstat (limited to 'drivers/ata/ata_generic.c')
| -rw-r--r-- | drivers/ata/ata_generic.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c index 47aeccd52fa9..75a406f5e694 100644 --- a/drivers/ata/ata_generic.c +++ b/drivers/ata/ata_generic.c @@ -152,6 +152,12 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id if (dev->vendor == PCI_VENDOR_ID_AL) ata_pci_bmdma_clear_simplex(dev); + 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); } |