From: Neil Muller <drnlmuller+bugs@gmail.com>
Date: Wed, 1 Aug 2007 15:52:04 +0000 (+0200)
Subject: sis190 check for ISA bridge on SiS966
X-Git-Tag: v2.6.23-rc3~88
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8eb7ad68bd10d858066ca51713ca5645996e77a5;p=linux-2.6

sis190 check for ISA bridge on SiS966

sis190 driver assumes to find ISA only on SiS965.
similar fix is in sis900 driver, see bug report
http://bugs.debian.org/435547

Signed-off-by: maximilian attems <max@stro.at>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index ec2ad9f0ef..d470b19c08 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -1593,6 +1593,9 @@ static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
 		  pci_name(pdev));
 
 	isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, 0x0965, NULL);
+	if (!isa_bridge)
+		isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, 0x0966, NULL);
+
 	if (!isa_bridge) {
 		net_probe(tp, KERN_INFO "%s: Can not find ISA bridge.\n",
 			  pci_name(pdev));