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

Next file: linux/drivers/net/seeq8005.c
Previous file: linux/drivers/net/rrunner.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/net/rtl8129.c linux/drivers/net/rtl8129.c
@@ -353,8 +353,12 @@
 			continue;
 
 		pdev = pci_find_slot(pci_bus, pci_device_fn);
-		ioaddr = pdev->resource[0].start;
+
+		ioaddr = pci_resource_start(pdev, 0);
 		irq = pdev->irq;
+
+		if (pci_enable_device(pdev))
+			continue;
 
 		if ((pci_tbl[chip_idx].flags & PCI_USES_IO) &&
 			check_region(ioaddr, pci_tbl[chip_idx].io_size))

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)