diff options
| author | hselasky <hselasky@FreeBSD.org> | 2011-12-19 14:53:42 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2011-12-19 14:53:42 +0000 |
| commit | 7240dddfccf6e401bb5e36ff502227462cc927d4 (patch) | |
| tree | 668269bda7dbd16ec3ef8bc64d169d317a2b23ac | |
| parent | 3e050c7f7a3d7eb2215c9899d916d9a6e21f72f4 (diff) | |
| download | FreeBSD-src-7240dddfccf6e401bb5e36ff502227462cc927d4.zip FreeBSD-src-7240dddfccf6e401bb5e36ff502227462cc927d4.tar.gz | |
Add missing unlock of USB controller's lock, when
doing shutdown, suspend and resume.
Suggested by: avg @
MFC after: 3 days
| -rw-r--r-- | sys/dev/usb/controller/usb_controller.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c index f31ab5b..6454e81 100644 --- a/sys/dev/usb/controller/usb_controller.c +++ b/sys/dev/usb/controller/usb_controller.c @@ -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 |
