From owner-p4-projects@FreeBSD.ORG  Thu Jul 20 17:25:34 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 2AE0116A4E0; Thu, 20 Jul 2006 17:25:34 +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 0478516A4DE
	for <perforce@freebsd.org>; Thu, 20 Jul 2006 17:25:34 +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 B1DDA43D46
	for <perforce@freebsd.org>; Thu, 20 Jul 2006 17:25:33 +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 k6KHPXUJ029100
	for <perforce@freebsd.org>; Thu, 20 Jul 2006 17:25:33 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6KHPXoH029097
	for perforce@freebsd.org; Thu, 20 Jul 2006 17:25:33 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 20 Jul 2006 17:25:33 GMT
Message-Id: <200607201725.k6KHPXoH029097@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 102009 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: Thu, 20 Jul 2006 17:25:34 -0000

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

Change 102009 by imp@imp_lighthouse on 2006/07/20 17:25:06

	Bring in device disabling from the newcard tree.

Affected files ...

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

Differences ...

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

@@ -2373,6 +2373,11 @@
 		}
 		return (error);
 	}
+	if (resource_disabled(device_get_name(dev), device_get_unit(dev))) {
+		device_disable(dev);
+		device_printf(dev, "not probed (disabled)\n");
+                return (0);
+	}
 	error = device_attach(dev);
 
 	return (error);