patch-2.3.99-pre7 linux/drivers/atm/fore200e.c

• Lines: 27
• Date: Fri Apr 28 23:00:04 2000
• Orig file: v2.3.99-pre6/linux/drivers/atm/fore200e.c
• Orig date: Wed Apr 26 16:34:07 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/atm/fore200e.c linux/drivers/atm/fore200e.c
@@ -647,6 +647,9 @@
 	if (pci_dev == NULL)
 	    return NULL;
     } while (count--);
+
+    if (pci_enable_device(pci_dev))
+	return NULL;
     
     fore200e = fore200e_kmalloc(sizeof(struct fore200e), GFP_KERNEL);
     if (fore200e == NULL)
@@ -655,7 +658,7 @@
     fore200e->bus       = bus;
     fore200e->bus_dev   = pci_dev;    
     fore200e->irq       = pci_dev->irq;
-    fore200e->phys_base = (pci_dev->resource[0].start & PCI_BASE_ADDRESS_MEM_MASK);
+    fore200e->phys_base = pci_resource_start (pci_dev, 0);
 
 #if defined(__powerpc__)
     fore200e->phys_base += KERNELBASE;
@@ -663,7 +666,6 @@
 
     sprintf(fore200e->name, "%s-%d", bus->model_name, index - 1);
 
-    pci_enable_device(pci_dev);
     pci_set_master(pci_dev);
 
     return fore200e;