diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /drivers/net/ne2k-pci.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/net/ne2k-pci.c')
| -rw-r--r-- | drivers/net/ne2k-pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index b404574fe..8234f838a 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c @@ -202,6 +202,10 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev, if (fnd_cnt++ == 0) printk(KERN_INFO "%s" KERN_INFO "%s", version1, version2); + i = pci_enable_device (pdev); + if (i) + return i; + ioaddr = pci_resource_start (pdev, 0); irq = pdev->irq; @@ -210,10 +214,6 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev, return -ENODEV; } - i = pci_enable_device (pdev); - if (i) - return i; - if (request_region (ioaddr, NE_IO_EXTENT, "ne2k-pci") == NULL) { printk (KERN_ERR "ne2k-pci: I/O resource 0x%x @ 0x%lx busy\n", NE_IO_EXTENT, ioaddr); |