Date: Sat, 14 Nov 2009 13:55:52 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 170613 for review Message-ID: <200911141355.nAEDtqrd043378@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 */ }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911141355.nAEDtqrd043378>