diff options
| author |   Neil Muller <drnlmuller+bugs@gmail.com> | 2007-08-01 17:52:04 +0200 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-08-07 17:18:32 -0400 |
| commit | 8eb7ad68bd10d858066ca51713ca5645996e77a5 (patch) | |
| tree | cfd81b6d1cb2495133066dad5e2f549195111789 /drivers/net/sis190.c | |
| parent | atl1: use spin_trylock_irqsave() (diff) | |
| download | linux-dev-8eb7ad68bd10d858066ca51713ca5645996e77a5.tar.xz linux-dev-8eb7ad68bd10d858066ca51713ca5645996e77a5.zip | |
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>
Diffstat (limited to 'drivers/net/sis190.c')
| -rw-r--r-- | drivers/net/sis190.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index ec2ad9f0efa2..d470b19c0810 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)); |