From 38271793b9e20d3d6f8f0070db8a7d18dbf0db20 Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Tue, 4 Dec 2007 22:58:41 +0100 Subject: [PATCH] --- yaml --- r: 75651 b: refs/heads/master c: ebc71647309539aaf9088f4e41b9f364cce8f7eb h: refs/heads/master i: 75649: b9eb25970acf6443fbed0b6482781c19ff7c30df 75647: 23cc001aa0eb3aca4a09339898d88c1dfddb6fc0 v: v3 --- [refs] | 2 +- trunk/drivers/net/sis190.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6d0cec425e08..ab4f69ef36e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f945fa7ad9c12a3356a3de7fb2143ccc2f2c3bca +refs/heads/master: ebc71647309539aaf9088f4e41b9f364cce8f7eb diff --git a/trunk/drivers/net/sis190.c b/trunk/drivers/net/sis190.c index 7eab072ae792..c63f484f9072 100644 --- a/trunk/drivers/net/sis190.c +++ b/trunk/drivers/net/sis190.c @@ -1549,28 +1549,31 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev, } /** - * sis190_get_mac_addr_from_apc - Get MAC address for SiS965 model + * sis190_get_mac_addr_from_apc - Get MAC address for SiS96x model * @pdev: PCI device * @dev: network device to get address for * - * SiS965 model, use APC CMOS RAM to store MAC address. + * SiS96x model, use APC CMOS RAM to store MAC address. * APC CMOS RAM is accessed through ISA bridge. * MAC address is read into @net_dev->dev_addr. */ static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev, struct net_device *dev) { + static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 }; struct sis190_private *tp = netdev_priv(dev); struct pci_dev *isa_bridge; u8 reg, tmp8; - int i; + unsigned int i; net_probe(tp, KERN_INFO "%s: Read MAC address from APC.\n", 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); + for (i = 0; i < ARRAY_SIZE(ids); i++) { + isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, ids[i], NULL); + if (isa_bridge) + break; + } if (!isa_bridge) { net_probe(tp, KERN_INFO "%s: Can not find ISA bridge.\n",