fix lockup of hid on reset
PATCH 1/1 fix lockup of hid on reset
This fixes a use of flush_scheduled_work() in USB HID's reset logic that can deadlock. It's against the next tree.
Signed-off-by Oliver Neukum <[email protected]>
Tested-by Valdis Kletniks <[email protected]>
Regards
Oliver
drivers/hid/usbhid/hid-core.c +1 -1
@@ -1210,7 +1210,6 @@ static void hid_cease_io(struct usbhid_device *usbhid)usb_kill_urb (usbhid->urbin);usb_kill_urb (usbhid->urbctrl);usb_kill_urb (usbhid->urbout); -flush_scheduled_work (); }/* Treat USB reset pretty much the same as suspend/resume */
@@ -1222,6 +1221,7 @@ static int hid_pre_reset(struct usb_interface *intf)spin_lock_irq (&usbhid->lock);set_bit (HID_RESET_PENDING , &usbhid->iofl);spin_unlock_irq (&usbhid->lock); +cancel_work_sync (&usbhid->restart_work);hid_cease_io (usbhid);return 0 ;