git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
hid
/
usbhid
/
hid-core.c
diff --git
a/drivers/hid/usbhid/hid-core.c
b/drivers/hid/usbhid/hid-core.c
index
ad978f5
..
77e705c
100644
(file)
--- a/
drivers/hid/usbhid/hid-core.c
+++ b/
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);