Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fa45a4c authored by Alan Stern's avatar Alan Stern Committed by Jiri Kosina
Browse files

USB HID: avoid flush_scheduled_work() 



This patch (as914) replaces a call to flush_scheduled_work() with
cancel_work_sync(), in order to help avoid potential deadlocks.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 3cd70986

drivers/hid/usbhid/hid-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -956,7 +956,7 @@ static void hid_disconnect(struct usb_interface *intf) 
	usb_kill_urb(usbhid->urbctrl);

	usb_kill_urb(usbhid->urbctrl);





	del_timer_sync(&usbhid->io_retry);

	del_timer_sync(&usbhid->io_retry);

	flush_scheduled_work();

	cancel_work_sync(&usbhid->reset_work);





	if (hid->claimed & HID_CLAIMED_INPUT)

	if (hid->claimed & HID_CLAIMED_INPUT)

		hidinput_disconnect(hid);

		hidinput_disconnect(hid);