diff options
author | Felix Fietkau <nbd@openwrt.org> | 2009-01-06 22:38:38 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2009-01-06 22:38:38 +0000 |
commit | 2a209cbc0d662272d4dcb709b6acb4d69220deb3 (patch) | |
tree | c65a024af7aead0933fef9da6cc8416e7abcce76 /target/linux/brcm47xx/patches-2.6.23/410-aec62xx_pci_enable.patch | |
parent | bf40723bfa29602523e9ae566f5c6503c7c22d8a (diff) | |
download | master-187ad058-2a209cbc0d662272d4dcb709b6acb4d69220deb3.tar.gz master-187ad058-2a209cbc0d662272d4dcb709b6acb4d69220deb3.tar.bz2 master-187ad058-2a209cbc0d662272d4dcb709b6acb4d69220deb3.zip |
nuke old 2.6.23 code for brcm47xx
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13910 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.23/410-aec62xx_pci_enable.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.23/410-aec62xx_pci_enable.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.23/410-aec62xx_pci_enable.patch b/target/linux/brcm47xx/patches-2.6.23/410-aec62xx_pci_enable.patch deleted file mode 100644 index 4e57ecbdaf..0000000000 --- a/target/linux/brcm47xx/patches-2.6.23/410-aec62xx_pci_enable.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/drivers/ide/pci/aec62xx.c -+++ b/drivers/ide/pci/aec62xx.c -@@ -248,7 +248,14 @@ - - static int __devinit init_setup_aec6x80(struct pci_dev *dev, ide_pci_device_t *d) - { -- unsigned long dma_base = pci_resource_start(dev, 4); -+ unsigned long dma_base; -+ int err; -+ -+ err = pci_enable_device(dev); -+ if (err) -+ return err; -+ -+ dma_base = pci_resource_start(dev, 4); - - if (inb(dma_base + 2) & 0x10) { - d->name = (dev->device == PCI_DEVICE_ID_ARTOP_ATP865R) ? -@@ -256,7 +263,11 @@ - d->udma_mask = 0x7f; /* udma0-6 */ - } - -- return ide_setup_pci_device(dev, d); -+ err = ide_setup_pci_device(dev, d); -+ if(err) -+ pci_disable_device(dev); -+ -+ return err; - } - - static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { |