PERFORCE change 178034 for review

[Hans Petter Selasky]

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

Change 178034 by hselasky at 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
 }
 
 /*------------------------------------------------------------------------*