patch-2.4.0-test2 linux/drivers/net/rcpci45.c

• Lines: 18
• Date: Mon Jun 19 13:42:38 2000
• Orig file: v2.4.0-test1/linux/drivers/net/rcpci45.c
• Orig date: Thu May 11 15:30:07 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/net/rcpci45.c linux/drivers/net/rcpci45.c
@@ -205,7 +205,7 @@
 	    !((pdev = pci_find_slot(pci_bus, pci_device_fn))))
             break;
 	pci_irq_line = pdev->irq;
-	pci_ioaddr = pdev->resource[0].start;
+	pci_ioaddr = pci_resource_start (pdev, 0);
 
 #ifdef RCDEBUG
         printk("rc: Found RedCreek PCI adapter\n");
@@ -214,6 +214,8 @@
         printk("rc: pci_ioaddr = 0x%x\n", pci_ioaddr);
 #endif
 
+	if (pci_enable_device(pdev))
+		break;
 	pci_set_master(pdev);
 
         if (!RCfound_device(pci_ioaddr, pci_irq_line,