svn commit: r200719 - stable/7/sys/dev/ichsmb

[Andriy Gapon]

Author: avg
Date: Sat Dec 19 11:10:33 2009
New Revision: 200719
URL: http://svn.freebsd.org/changeset/base/200719

Log:
  MFC r200053: ichsmb: try attaching only to intel hardware in the default case

Modified:
  stable/7/sys/dev/ichsmb/ichsmb_pci.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/ichsmb/ichsmb_pci.c
==============================================================================
--- stable/7/sys/dev/ichsmb/ichsmb_pci.c	Sat Dec 19 11:05:42 2009	(r200718)
+++ stable/7/sys/dev/ichsmb/ichsmb_pci.c	Sat Dec 19 11:10:33 2009	(r200719)
@@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ichsmb/ichsmb_reg.h>
 
 /* PCI unique identifiers */
+#define VENDORID_INTEL			0x8086
 #define ID_82801AA			0x24138086
 #define ID_82801AB			0x24238086
 #define ID_82801BA			0x24438086
@@ -175,10 +176,11 @@ ichsmb_pci_probe(device_t dev)
 		device_set_desc(dev, "Intel 631xESB/6321ESB (ESB2) SMBus controller");
 		break;
 	default:
-		if (pci_get_class(dev) == PCIC_SERIALBUS
+		if (pci_get_vendor(dev) == VENDORID_INTEL
+		    && pci_get_class(dev) == PCIC_SERIALBUS
 		    && pci_get_subclass(dev) == PCIS_SERIALBUS_SMBUS
 		    && pci_get_progif(dev) == PCIS_SERIALBUS_SMBUS_PROGIF) {
-			device_set_desc(dev, "SMBus controller");
+			device_set_desc(dev, "Intel SMBus controller");
 			return (BUS_PROBE_DEFAULT); /* XXX */
 		}
 		return (ENXIO);