From: Jiri Slaby <jirislaby@gmail.com>
Date: Mon, 27 Oct 2008 11:16:16 +0000 (+0100)
Subject: HID: sync on deleted io_retry timer in usbhid driver
X-Git-Tag: v2.6.28-rc3~44^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b170060c6ccd719eebb53b10c98df2a4e6968f28;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 3b1c489998c..18e5ddd722c 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");