From 9dff2d22856fa6522e7cfafa17f33f52668ec9de Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Thu, 13 Oct 2011 18:21:58 +0200 Subject: [PATCH] --- yaml --- r: 264765 b: refs/heads/master c: fad9fbe8651e8abd9794d4b4c4133241aa3093b5 h: refs/heads/master i: 264763: 1a5a25c9fafac0bc2940e04364487535568f0c00 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 a2100bbd0023..46145ab5bddb 100644 --- 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 index ad978f5748d3..77e705c2209c 100644 --- 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);