---

yaml --- r: 264765 b: refs/heads/master c: fad9fbe h: refs/heads/master i: 264763: 1a5a25c v: v3
git-mirror · Oct 13, 2011 · 9dff2d2 · 9dff2d2
1 parent 6c3bacc
commit 9dff2d2
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: 3797ef6b6bc041755318917855d63879679c6dd9
+refs/heads/master: fad9fbe8651e8abd9794d4b4c4133241aa3093b5
diff --git a/trunk/drivers/hid/usbhid/hid-core.c b/trunk/drivers/hid/usbhid/hid-core.c
@@ -1270,7 +1270,7 @@ static void hid_cancel_delayed_stuff(struct usbhid_device *usbhid)
 
 static void hid_cease_io(struct usbhid_device *usbhid)
 {
-	del_timer(&usbhid->io_retry);
+	del_timer_sync(&usbhid->io_retry);
 	usb_kill_urb(usbhid->urbin);
 	usb_kill_urb(usbhid->urbctrl);
 	usb_kill_urb(usbhid->urbout);