diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /drivers/atm/horizon.c | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/atm/horizon.c')
| -rw-r--r-- | drivers/atm/horizon.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c index f39845f85..dc39a1ce5 100644 --- a/drivers/atm/horizon.c +++ b/drivers/atm/horizon.c @@ -2759,9 +2759,6 @@ static int __init hrz_probe (void) { PRINTD (DBG_FLOW, "hrz_probe"); - if (!pci_present()) - return 0; - devs = 0; pci_dev = NULL; while ((pci_dev = pci_find_device @@ -2770,8 +2767,8 @@ static int __init hrz_probe (void) { hrz_dev * dev; // adapter slot free, read resources from PCI configuration space - u32 iobase = pci_dev->resource[0].start; - u32 * membase = bus_to_virt (pci_dev->resource[1].start); + u32 iobase = pci_resource_start (pci_dev, 0); + u32 * membase = bus_to_virt (pci_resource_start (pci_dev, 1)); u8 irq = pci_dev->irq; // check IO region @@ -2779,7 +2776,10 @@ static int __init hrz_probe (void) { PRINTD (DBG_WARN, "IO range already in use"); continue; } - + + if (pci_enable_device (pci_dev)) + continue; + dev = kmalloc (sizeof(hrz_dev), GFP_KERNEL); if (!dev) { // perhaps we should be nice: deregister all adapters and abort? |