From c62d9da261b5637ecc319d2904e41c95354c96c1 Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Wed, 30 May 2007 11:11:12 -0400
Subject: [PATCH] --- yaml --- r: 58417 b: refs/heads/master c:
 2fa45a4cffd0c4ab4e238e8ad3b4f9b0c10ac1f3 h: refs/heads/master i:   58415:
 085d48f5666462675e0bb0b96d888347caf2d095 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/hid/usbhid/hid-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 31f581c14542..53170323d0ca 100644
--- 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
index d91b9dac6dff..093abb5c9879 100644
--- 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);