From owner-p4-projects@FreeBSD.ORG  Mon May 10 12:11:18 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 26A2B1065679; Mon, 10 May 2010 12:11:18 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DF2711065672
	for <perforce@FreeBSD.org>; Mon, 10 May 2010 12:11:17 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id CD36A8FC16
	for <perforce@FreeBSD.org>; Mon, 10 May 2010 12:11:17 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4ACBHOv084163
	for <perforce@FreeBSD.org>; Mon, 10 May 2010 12:11:17 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4ACBHoP084161
	for perforce@freebsd.org; Mon, 10 May 2010 12:11:17 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 10 May 2010 12:11:17 GMT
Message-Id: <201005101211.o4ACBHoP084161@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 178034 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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 May 2010 12:11:18 -0000

http://p4web.freebsd.org/@@178034?ac=10

Change 178034 by hselasky@hselasky_laptop001 on 2010/05/10 12:11:10

	
	USB CORE:
		- add missing #if's
		- patch by: HPS @

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#41 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#41 (text+ko) ====

@@ -234,11 +234,12 @@
 
 		USB_BUS_UNLOCK(bus);
 
+#if USB_HAVE_POWERD
 		/*
 		 * First update the USB power state!
 		 */
 		usb_bus_powerd(bus);
-
+#endif
 		 /* Explore the Root USB HUB. */
 		(udev->hub->explore) (udev);
 		USB_BUS_LOCK(bus);
@@ -301,11 +302,13 @@
 	usb_proc_rewakeup(&bus->explore_proc);	/* recover from DDB */
 #endif
 
+#if USB_HAVE_POWERD
 	USB_BUS_UNLOCK(bus);
 
 	usb_bus_power_update(bus);
 
 	USB_BUS_LOCK(bus);
+#endif
 }
 
 /*------------------------------------------------------------------------*