From owner-p4-projects@FreeBSD.ORG  Mon Jul 10 22:50:02 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8B29E16A4DF; Mon, 10 Jul 2006 22:50:02 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 69A7316A4DD
	for <perforce@freebsd.org>; Mon, 10 Jul 2006 22:50:02 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 01FD343D6D
	for <perforce@freebsd.org>; Mon, 10 Jul 2006 22:49:39 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6AMncLl090641
	for <perforce@freebsd.org>; Mon, 10 Jul 2006 22:49:38 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6AMncuw090638
	for perforce@freebsd.org; Mon, 10 Jul 2006 22:49:38 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 10 Jul 2006 22:49:38 GMT
Message-Id: <200607102249.k6AMncuw090638@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 101247 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Jul 2006 22:50:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=101247

Change 101247 by imp@imp_lighthouse on 2006/07/10 22:49:21

	May need to adjust the unit twice.  Once in the main loop and
	again later since this might not be a pri = 0.

Affected files ...

.. //depot/projects/arm/src/sys/kern/subr_bus.c#12 edit

Differences ...

==== //depot/projects/arm/src/sys/kern/subr_bus.c#12 (text+ko) ====

@@ -1815,6 +1815,16 @@
 		if (!child->devclass)
 			device_set_devclass(child, best->driver->name);
 		device_set_driver(child, best->driver);
+		if (child->flags & DF_WILDCARD) {
+			unit = child->unit;
+			BUS_HINT_DEVICE_UNIT(dev, child, &unit);
+			if (unit != child->unit) {
+				childdc = child->devclass;
+				devclass_delete_device(childdc, child);
+				child->unit = unit;
+				devclass_add_device(childdc, child);
+			}
+		}
 		resource_int_value(best->driver->name, child->unit,
 		    "flags", &child->devflags);