target/linux/brcm47xx/patches-2.6.23/410-aec62xx_pci_enable.patch

   1 --- a/drivers/ide/pci/aec62xx.c
   2 +++ b/drivers/ide/pci/aec62xx.c
   3 @@ -248,7 +248,14 @@
   4
   5  static int __devinit init_setup_aec6x80(struct pci_dev *dev, ide_pci_device_t *d)
   6  {
   7 -       unsigned long dma_base = pci_resource_start(dev, 4);
   8 +       unsigned long dma_base;
   9 +       int err;
  10 +
  11 +       err = pci_enable_device(dev);
  12 +       if (err)
  13 +               return err;
  14 +
  15 +       dma_base = pci_resource_start(dev, 4);
  16
  17         if (inb(dma_base + 2) & 0x10) {
  18                 d->name = (dev->device == PCI_DEVICE_ID_ARTOP_ATP865R) ?
  19 @@ -256,7 +263,11 @@
  20                 d->udma_mask = 0x7f; /* udma0-6 */
  21         }
  22
  23 -       return ide_setup_pci_device(dev, d);
  24 +       err = ide_setup_pci_device(dev, d);
  25 +       if(err)
  26 +               pci_disable_device(dev);
  27 +
  28 +       return err;
  29  }
  30
  31  static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {