From owner-svn-src-all@FreeBSD.ORG  Sun Oct 20 18:38:20 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2BF4F5B8;
 Sun, 20 Oct 2013 18:38:20 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1933128E0;
 Sun, 20 Oct 2013 18:38:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9KIcJTP092506;
 Sun, 20 Oct 2013 18:38:19 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9KIcJLQ092505;
 Sun, 20 Oct 2013 18:38:19 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201310201838.r9KIcJLQ092505@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 20 Oct 2013 18:38:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256798 - head/sys/dev/fdt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sun, 20 Oct 2013 18:38:20 -0000

Author: nwhitehorn
Date: Sun Oct 20 18:38:19 2013
New Revision: 256798
URL: http://svnweb.freebsd.org/changeset/base/256798

Log:
  Some nexus devices add wildcard children. Since fdtbus_probe returned
  BUS_PROBE_DEFAULT, it would attach to them all, producing both many
  fdtbus instances and preventing other devices from attaching. Instead
  return BUS_PROBE_NOWILDCARD, which exists for exactly this purpose.

Modified:
  head/sys/dev/fdt/fdtbus.c

Modified: head/sys/dev/fdt/fdtbus.c
==============================================================================
--- head/sys/dev/fdt/fdtbus.c	Sun Oct 20 18:13:06 2013	(r256797)
+++ head/sys/dev/fdt/fdtbus.c	Sun Oct 20 18:38:19 2013	(r256798)
@@ -161,7 +161,7 @@ fdtbus_probe(device_t dev)
 	device_set_desc(dev, "FDT main bus");
 	if (!bootverbose)
 		device_quiet(dev);
-	return (BUS_PROBE_DEFAULT);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int