netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [patch] sis190 check for ISA bridge on SiS966
@ 2007-08-01 15:52 maximilian attems
  2007-08-07 21:19 ` Jeff Garzik
  0 siblings, 1 reply; 2+ messages in thread
From: maximilian attems @ 2007-08-01 15:52 UTC (permalink / raw)
  To: netdev; +Cc: jgarzik, Neil Muller

From: Neil Muller <drnlmuller+bugs@gmail.com>

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>

---

 drivers/net/sis190.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index ec2ad9f..d470b19 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));

-- 
maks

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [patch] sis190 check for ISA bridge on SiS966
  2007-08-01 15:52 [patch] sis190 check for ISA bridge on SiS966 maximilian attems
@ 2007-08-07 21:19 ` Jeff Garzik
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-08-07 21:19 UTC (permalink / raw)
  To: maximilian attems; +Cc: netdev, Neil Muller

maximilian attems wrote:
> From: Neil Muller <drnlmuller+bugs@gmail.com>
> 
> 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>

applied to #upstream-fixes



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-08-07 21:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-01 15:52 [patch] sis190 check for ISA bridge on SiS966 maximilian attems
2007-08-07 21:19 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).