---

yaml --- r: 144383 b: refs/heads/master c: 89092dd h: refs/heads/master i: 144381: cdd73fa 144379: a0052b3 144375: c6eb5d9 144367: a054394 144351: b3b302e 144319: fd7fdeb 144255: 8bf7802 144127: 5611be4 143871: f9d9a86 143359: 808b3c9 v: v3
git-mirror · Apr 29, 2009 · 85b894e · 85b894e
1 parent f038682
commit 85b894e
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: 2feaace40e5c3133fea795333402f30929a200d9
+refs/heads/master: 89092ddd7aca598e3b8874f7a49216e7917d8f3f
diff --git 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);