Date: Mon, 19 Dec 2011 14:53:42 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r228709 - head/sys/dev/usb/controller Message-ID: <201112191453.pBJErgYA062167@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Mon Dec 19 14:53:42 2011 New Revision: 228709 URL: http://svn.freebsd.org/changeset/base/228709 Log: Add missing unlock of USB controller's lock, when doing shutdown, suspend and resume. Suggested by: avg @ MFC after: 3 days Modified: head/sys/dev/usb/controller/usb_controller.c Modified: head/sys/dev/usb/controller/usb_controller.c ============================================================================== --- head/sys/dev/usb/controller/usb_controller.c Mon Dec 19 13:38:28 2011 (r228708) +++ head/sys/dev/usb/controller/usb_controller.c Mon Dec 19 14:53:42 2011 (r228709) @@ -390,6 +390,8 @@ usb_bus_suspend(struct usb_proc_msg *pm) if (udev == NULL || bus->bdev == NULL) return; + USB_BUS_UNLOCK(bus); + bus_generic_shutdown(bus->bdev); usbd_enum_lock(udev); @@ -410,6 +412,8 @@ usb_bus_suspend(struct usb_proc_msg *pm) (bus->methods->set_hw_power_sleep) (bus, USB_HW_POWER_SUSPEND); usbd_enum_unlock(udev); + + USB_BUS_LOCK(bus); } /*------------------------------------------------------------------------* @@ -430,6 +434,8 @@ usb_bus_resume(struct usb_proc_msg *pm) if (udev == NULL || bus->bdev == NULL) return; + USB_BUS_UNLOCK(bus); + usbd_enum_lock(udev); #if 0 DEVMETHOD(usb_take_controller, NULL); /* dummy */ @@ -457,6 +463,8 @@ usb_bus_resume(struct usb_proc_msg *pm) device_printf(bus->bdev, "Could not configure root HUB\n"); usbd_enum_unlock(udev); + + USB_BUS_LOCK(bus); } /*------------------------------------------------------------------------* @@ -477,6 +485,8 @@ usb_bus_shutdown(struct usb_proc_msg *pm if (udev == NULL || bus->bdev == NULL) return; + USB_BUS_UNLOCK(bus); + bus_generic_shutdown(bus->bdev); usbd_enum_lock(udev); @@ -497,6 +507,8 @@ usb_bus_shutdown(struct usb_proc_msg *pm (bus->methods->set_hw_power_sleep) (bus, USB_HW_POWER_SHUTDOWN); usbd_enum_unlock(udev); + + USB_BUS_LOCK(bus); } static void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112191453.pBJErgYA062167>