From 85b894e61d62b017100eef1f16958a65824074c2 Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oliver@neukum.org>
Date: Wed, 29 Apr 2009 17:12:12 +0200
Subject: [PATCH] --- yaml --- r: 144383 b: refs/heads/master c:
 89092ddd7aca598e3b8874f7a49216e7917d8f3f h: refs/heads/master i:   144381:
 cdd73fa1fa053db9caeb348895edb42480d620ce   144379:
 a0052b3858388a36625dfbb96b08fb2f4a7adeca   144375:
 c6eb5d936163d7c70bf693a9ef9a2f39bd9c66d2   144367:
 a054394c2592fa0d44a168b3af0c9a1352468cd9   144351:
 b3b302e136f55fcd61b734525314e531dec024c1   144319:
 fd7fdeb8e65133f0e62f8498b613d1d5837f6538   144255:
 8bf78026ff1ab035d302b1b6ef9fc99854e96c73   144127:
 5611be41294991ce0bfcccf64de38068488ae2f2   143871:
 f9d9a86c9306f488d8e3b3cac5fdb2c2af72a9e4   143359:
 808b3c9e30989b03e7757567bebd8f8dadb0602a 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 e9fd4b717fbe..0504c16dcafb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2feaace40e5c3133fea795333402f30929a200d9
+refs/heads/master: 89092ddd7aca598e3b8874f7a49216e7917d8f3f
diff --git a/trunk/drivers/hid/usbhid/hid-core.c b/trunk/drivers/hid/usbhid/hid-core.c
index 4306cb1b8ce5..900ce18dd549 100644
--- a/trunk/drivers/hid/usbhid/hid-core.c
+++ b/trunk/drivers/hid/usbhid/hid-core.c
@@ -662,8 +662,8 @@ void usbhid_close(struct hid_device *hid)
 	spin_lock_irq(&usbhid->lock);
 	if (!--hid->open) {
 		spin_unlock_irq(&usbhid->lock);
+		hid_cancel_delayed_stuff(usbhid);
 		usb_kill_urb(usbhid->urbin);
-		flush_scheduled_work();
 		usbhid->intf->needs_remote_wakeup = 0;
 	} else {
 		spin_unlock_irq(&usbhid->lock);