[netdrvr sis900] fix ISA bridge detection

663f87fa · Daniele Venzano · Jeff Garzik · 2e7d2212 · 663f87fa
Commit 663f87fa authored May 19, 2004 by Daniele Venzano Committed by Jeff Garzik May 19, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

drivers/net/sis900.c drivers/net/sis900.c +7 -3

No files found.
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -260,9 +260,13 @@ static int __devinit sis630e_get_mac_addr(struct pci_dev * pci_dev, struct net_d
 	u8 reg;
 	int i;
-	if ((isa_bridge = pci_find_device(0x1039, 0x0008, isa_bridge)) == NULL) {
+	isa_bridge = pci_find_device(PCI_VENDOR_ID_SI, 0x0008, isa_bridge);
-		printk("%s: Can not find ISA bridge\n", net_dev->name);
+	if (!isa_bridge) {
-		return 0;
+		isa_bridge = pci_find_device(PCI_VENDOR_ID_SI, 0x0018, isa_bridge);
+		if (!isa_bridge) {
+			printk("%s: Can not find ISA bridge\n", net_dev->name);
+			return 0;
+		}
 	}
 	pci_read_config_byte(isa_bridge, 0x48, &reg);
 	pci_write_config_byte(isa_bridge, 0x48, reg | 0x40);