---

yaml --- r: 58417 b: refs/heads/master c: 2fa45a4 h: refs/heads/master i: 58415: 085d48f v: v3
git-mirror · Jul 9, 2007 · c62d9da · c62d9da
1 parent 28e3ac9
commit c62d9da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cd709866f639d24b0d0f38567c19662c98ea92e
+refs/heads/master: 2fa45a4cffd0c4ab4e238e8ad3b4f9b0c10ac1f3
diff --git a/trunk/drivers/hid/usbhid/hid-core.c b/trunk/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);