patch-2.3.99-pre7 linux/drivers/char/specialix.c

Next file: linux/drivers/char/stallion.c
Previous file: linux/drivers/char/softdog.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/char/specialix.c linux/drivers/char/specialix.c
@@ -2351,11 +2351,12 @@
 			                        pdev);
 			if (!pdev) break;
 
+			if (pci_enable_device(pdev))
+				continue;
+
 			sx_board[i].irq = pdev->irq;
 
-			pci_read_config_dword(pdev, PCI_BASE_ADDRESS_2, &tint);
-			/* Mask out the fact that it's IO-space */
-			sx_board[i].base = tint & PCI_BASE_ADDRESS_IO_MASK; 
+			sx_board[i].base = pci_resource_start (pdev, 2);
 
 			sx_board[i].flags |= SX_BOARD_IS_PCI;
 			if (!sx_probe(&sx_board[i]))

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