patch-2.4.0-test2 linux/drivers/net/skfp/skfddi.c

• Lines: 18
• Date: Mon Jun 19 13:42:38 2000
• Orig file: v2.4.0-test1/linux/drivers/net/skfp/skfddi.c
• Orig date: Fri May 12 14:18:55 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/net/skfp/skfddi.c linux/drivers/net/skfp/skfddi.c
@@ -305,6 +305,8 @@
 			pdev)) == 0) {
 			break;
 		}
+		if (pci_enable_device(pdev))
+			continue;
 
 #ifndef MEM_MAPPED_IO
 		/* Verify that I/O enable bit is set (PCI slot is enabled) */
@@ -352,7 +354,7 @@
 		command &= ~PCI_COMMAND_IO;
 		pci_write_config_word(pdev, PCI_COMMAND, command);
 
-		port = pdev->resource[0].start;
+		port = pci_resource_start(pdev, 0);
 
 		port = (unsigned long)ioremap(port, 0x4000);
 		if (!port){