From owner-svn-src-all@FreeBSD.ORG  Fri Nov 14 18:09:20 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 388C7106567E;
	Fri, 14 Nov 2008 18:09:20 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2E5058FC08;
	Fri, 14 Nov 2008 18:09:20 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAEI9KDH098553;
	Fri, 14 Nov 2008 18:09:20 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAEI9KJ8098552;
	Fri, 14 Nov 2008 18:09:20 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200811141809.mAEI9KJ8098552@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 14 Nov 2008 18:09:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184973 - in stable/7/sys: . dev/pccbb modules/cxgb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Nov 2008 18:09:20 -0000

Author: imp
Date: Fri Nov 14 18:09:19 2008
New Revision: 184973
URL: http://svn.freebsd.org/changeset/base/184973

Log:
  Merge r183539 and r183558: Do match on class to avoid false positives,
  return BUS_GENERIC_PROBE for a generic match.
  
  Approved by:	re@

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/dev/pccbb/pccbb_pci.c
  stable/7/sys/modules/cxgb/   (props changed)

Modified: stable/7/sys/dev/pccbb/pccbb_pci.c
==============================================================================
--- stable/7/sys/dev/pccbb/pccbb_pci.c	Fri Nov 14 12:31:05 2008	(r184972)
+++ stable/7/sys/dev/pccbb/pccbb_pci.c	Fri Nov 14 18:09:19 2008	(r184973)
@@ -229,6 +229,7 @@ cbb_pci_probe(device_t brdev)
 {
 	const char *name;
 	uint32_t progif;
+	uint32_t baseclass;
 	uint32_t subclass;
 
 	/*
@@ -245,11 +246,13 @@ cbb_pci_probe(device_t brdev)
 	 * to date have progif 0 (the Yenta spec, and successors mandate
 	 * this).
 	 */
+	baseclass = pci_get_class(brdev);
 	subclass = pci_get_subclass(brdev);
 	progif = pci_get_progif(brdev);
-	if (subclass == PCIS_BRIDGE_CARDBUS && progif == 0) {
+	if (baseclass == PCIC_BRIDGE &&
+	    subclass == PCIS_BRIDGE_CARDBUS && progif == 0) {
 		device_set_desc(brdev, "PCI-CardBus Bridge");
-		return (BUS_PROBE_DEFAULT);
+		return (BUS_PROBE_GENERIC);
 	}
 	return (ENXIO);
 }