Date: Mon, 17 May 2010 23:48:03 +0000 (UTC) From: Andrew Thompson <thompsa@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r208225 - stable/8/sys/dev/usb/controller Message-ID: <201005172348.o4HNm3La075315@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thompsa Date: Mon May 17 23:48:03 2010 New Revision: 208225 URL: http://svn.freebsd.org/changeset/base/208225 Log: MFC r208013 Add missing ifdefs for usb power saving support. Modified: stable/8/sys/dev/usb/controller/usb_controller.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/geom/sched/ (props changed) Modified: stable/8/sys/dev/usb/controller/usb_controller.c ============================================================================== --- stable/8/sys/dev/usb/controller/usb_controller.c Mon May 17 23:47:24 2010 (r208224) +++ stable/8/sys/dev/usb/controller/usb_controller.c Mon May 17 23:48:03 2010 (r208225) @@ -234,11 +234,12 @@ usb_bus_explore(struct usb_proc_msg *pm) 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_power_wdog(void *arg) 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 } /*------------------------------------------------------------------------*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005172348.o4HNm3La075315>