From owner-svn-src-all@FreeBSD.ORG  Fri Jun 24 04:35:58 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7CFCA106564A;
	Fri, 24 Jun 2011 04:35:58 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B39E8FC13;
	Fri, 24 Jun 2011 04:35:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5O4ZwB8030338;
	Fri, 24 Jun 2011 04:35:58 GMT
	(envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5O4Zwdh030336;
	Fri, 24 Jun 2011 04:35:58 GMT
	(envelope-from hselasky@svn.freebsd.org)
Message-Id: <201106240435.p5O4Zwdh030336@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Fri, 24 Jun 2011 04:35:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223490 - head/tools/tools/bus_autoconf
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, 24 Jun 2011 04:35:58 -0000

Author: hselasky
Date: Fri Jun 24 04:35:58 2011
New Revision: 223490
URL: http://svn.freebsd.org/changeset/base/223490

Log:
  - Make sure we don't match the wrong device by adding
  a match for the bus the device belongs to.
  
  PR:		misc/157903
  MFC after:	14 days

Modified:
  head/tools/tools/bus_autoconf/bus_autoconf.c

Modified: head/tools/tools/bus_autoconf/bus_autoconf.c
==============================================================================
--- head/tools/tools/bus_autoconf/bus_autoconf.c	Fri Jun 24 04:16:06 2011	(r223489)
+++ head/tools/tools/bus_autoconf/bus_autoconf.c	Fri Jun 24 04:35:58 2011	(r223490)
@@ -150,6 +150,7 @@ usb_dump(struct usb_device_id *id, uint3
 
 	if (info.is_any) {
 		printf("nomatch 10 {\n"
+		    "	match \"bus\" \"uhub[0-9]+\";\n"
 		    "	match \"mode\" \"%s\";\n", mode);
 	} else {
 		return (n);