diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2007-05-30 11:11:12 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2007-07-09 14:13:30 +0200 |
| commit | 2fa45a4cffd0c4ab4e238e8ad3b4f9b0c10ac1f3 (patch) | |
| tree | f5e5c5f42ca7089ea192830227fc8679403c7566 /drivers/hid/usbhid | |
| parent | 3cd709866f639d24b0d0f38567c19662c98ea92e (diff) | |
| download | blackbird-op-linux-2fa45a4cffd0c4ab4e238e8ad3b4f9b0c10ac1f3.tar.gz blackbird-op-linux-2fa45a4cffd0c4ab4e238e8ad3b4f9b0c10ac1f3.zip | |
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: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid')
| -rw-r--r-- | drivers/hid/usbhid/hid-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index d91b9dac6dff..093abb5c9879 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -956,7 +956,7 @@ static void hid_disconnect(struct usb_interface *intf) usb_kill_urb(usbhid->urbctrl); del_timer_sync(&usbhid->io_retry); - flush_scheduled_work(); + cancel_work_sync(&usbhid->reset_work); if (hid->claimed & HID_CLAIMED_INPUT) hidinput_disconnect(hid); |
