From owner-p4-projects@FreeBSD.ORG  Sat Nov 14 13:55:53 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 046C21065672; Sat, 14 Nov 2009 13:55:53 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BA7CC106566B
	for <perforce@FreeBSD.org>; Sat, 14 Nov 2009 13:55:52 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A7C758FC1E
	for <perforce@FreeBSD.org>; Sat, 14 Nov 2009 13:55:52 +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 nAEDtqk5043380
	for <perforce@FreeBSD.org>; Sat, 14 Nov 2009 13:55:52 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAEDtqrd043378
	for perforce@freebsd.org; Sat, 14 Nov 2009 13:55:52 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 14 Nov 2009 13:55:52 GMT
Message-Id: <200911141355.nAEDtqrd043378@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 170613 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: Sat, 14 Nov 2009 13:55:53 -0000

http://p4web.freebsd.org/chv.cgi?CH=170613

Change 170613 by hselasky@hselasky_laptop001 on 2009/11/14 13:55:00

	
	USB CORE:
		 - fix compilation without power daemon

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#23 edit

Differences ...

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

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

==== //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#23 (text+ko) ====

@@ -438,8 +438,10 @@
 
 	USB_BUS_UNLOCK(bus);
 
+#if USB_HAVE_POWERD
 	/* In case we are out of sync, update the power state. */
 	usb_bus_power_update(udev->bus);
+#endif
 	return (0);			/* success */
 }