HID: sync on deleted io_retry timer in usbhid driver

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

When suspending, make sure that the timer is not running
any more.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

authored by

Jiri Slaby and committed by

Jiri Kosina 17 years ago b170060c 3d5afd32

+1 -1

1 changed file

expand all

drivers

hid

usbhid

hid-core.c

+1 -1

drivers/hid/usbhid/hid-core.c

··· 1047 1047 spin_lock_irq(&usbhid->inlock); /* Sync with error handler */ 1048 1048 set_bit(HID_SUSPENDED, &usbhid->iofl); 1049 1049 spin_unlock_irq(&usbhid->inlock); 1050 - del_timer(&usbhid->io_retry); 1050 + del_timer_sync(&usbhid->io_retry); 1051 1051 usb_kill_urb(usbhid->urbin); 1052 1052 mutex_unlock(&usbhid->setup); 1053 1053 dev_dbg(&intf->dev, "suspend\n");