diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2008-10-27 12:16:16 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-10-27 15:07:08 +0100 |
| commit | b170060c6ccd719eebb53b10c98df2a4e6968f28 (patch) | |
| tree | cd1309c9a578fc984b8a0a4b992ac75ef0674c66 /drivers/hid/usbhid | |
| parent | 3d5afd324a4bf9f64f59599bf1e93cd7dd1dc97a (diff) | |
| download | blackbird-op-linux-b170060c6ccd719eebb53b10c98df2a4e6968f28.tar.gz blackbird-op-linux-b170060c6ccd719eebb53b10c98df2a4e6968f28.zip | |
HID: sync on deleted io_retry timer in usbhid driver
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>
Diffstat (limited to 'drivers/hid/usbhid')
| -rw-r--r-- | drivers/hid/usbhid/hid-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 3b1c489998c3..18e5ddd722cd 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -1047,7 +1047,7 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message) spin_lock_irq(&usbhid->inlock); /* Sync with error handler */ set_bit(HID_SUSPENDED, &usbhid->iofl); spin_unlock_irq(&usbhid->inlock); - del_timer(&usbhid->io_retry); + del_timer_sync(&usbhid->io_retry); usb_kill_urb(usbhid->urbin); mutex_unlock(&usbhid->setup); dev_dbg(&intf->dev, "suspend\n"); |
