d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing unlock of USB controller's lock, when

Browse Source 
doing shutdown, suspend and resume.

Suggested by:	avg @
MFC after:	3 days
This commit is contained in:
Hans Petter Selasky 2011-12-19 14:53:42 +00:00
parent 1d44b5b9f0
commit 6bd3e53514
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/usb/controller/usb_controller.c
View File

@ -390,6 +390,8 @@ usb_bus_suspend(struct usb_proc_msg *pm)
if (udev == NULL || bus->bdev == NULL) if (udev == NULL || bus->bdev == NULL)
return; return;
USB_BUS_UNLOCK(bus);
bus_generic_shutdown(bus->bdev); bus_generic_shutdown(bus->bdev);
usbd_enum_lock(udev); 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); (bus->methods->set_hw_power_sleep) (bus, USB_HW_POWER_SUSPEND);
usbd_enum_unlock(udev); 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) if (udev == NULL || bus->bdev == NULL)
return; return;
USB_BUS_UNLOCK(bus);
usbd_enum_lock(udev); usbd_enum_lock(udev);
#if 0 #if 0
DEVMETHOD(usb_take_controller, NULL); /* dummy */ 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"); device_printf(bus->bdev, "Could not configure root HUB\n");
usbd_enum_unlock(udev); 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) if (udev == NULL || bus->bdev == NULL)
return; return;
USB_BUS_UNLOCK(bus);
bus_generic_shutdown(bus->bdev); bus_generic_shutdown(bus->bdev);
usbd_enum_lock(udev); 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); (bus->methods->set_hw_power_sleep) (bus, USB_HW_POWER_SHUTDOWN);
usbd_enum_unlock(udev); usbd_enum_unlock(udev);
USB_BUS_LOCK(bus);
} }
static void static void