1 files changed, 33 insertions, 9 deletions

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index e2997a8d5e1b..56d06cd8075b 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -5,7 +5,7 @@
  *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
  *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
  *  Copyright (c) 2007-2008 Oliver Neukum
- *  Copyright (c) 2006-2009 Jiri Kosina
+ *  Copyright (c) 2006-2010 Jiri Kosina
  */
 
 /*
@@ -316,6 +316,7 @@ static int hid_submit_out(struct hid_device *hid)
                         err_hid("usb_submit_urb(out) failed");
                         return -1;
                 }
+                usbhid->last_out = jiffies;
         } else {
                 /*
                  * queue work to wake up the device.
@@ -377,6 +378,7 @@ static int hid_submit_ctrl(struct hid_device *hid)
                         err_hid("usb_submit_urb(ctrl) failed");
                         return -1;
                 }
+                usbhid->last_ctrl = jiffies;
         } else {
                 /*
                  * queue work to wake up the device.
@@ -512,9 +514,20 @@ static void __usbhid_submit_report(struct hid_device *hid, struct hid_report *re
                 usbhid->out[usbhid->outhead].report = report;
                 usbhid->outhead = head;
 
-                if (!test_and_set_bit(HID_OUT_RUNNING, &usbhid->iofl))
+                if (!test_and_set_bit(HID_OUT_RUNNING, &usbhid->iofl)) {
                         if (hid_submit_out(hid))
                                 clear_bit(HID_OUT_RUNNING, &usbhid->iofl);
+                } else {
+                        /*
+                         * the queue is known to run
+                         * but an earlier request may be stuck
+                         * we may need to time out
+                         * no race because this is called under
+                         * spinlock
+                         */
+                        if (time_after(jiffies, usbhid->last_out + HZ * 5))
+                                usb_unlink_urb(usbhid->urbout);
+                }
                 return;
         }
 
@@ -535,9 +548,20 @@ static void __usbhid_submit_report(struct hid_device *hid, struct hid_report *re
         usbhid->ctrl[usbhid->ctrlhead].dir = dir;
         usbhid->ctrlhead = head;
 
-        if (!test_and_set_bit(HID_CTRL_RUNNING, &usbhid->iofl))
+        if (!test_and_set_bit(HID_CTRL_RUNNING, &usbhid->iofl)) {
                 if (hid_submit_ctrl(hid))
                         clear_bit(HID_CTRL_RUNNING, &usbhid->iofl);
+        } else {
+                /*
+                 * the queue is known to run
+                 * but an earlier request may be stuck
+                 * we may need to time out
+                 * no race because this is called under
+                 * spinlock
+                 */
+                if (time_after(jiffies, usbhid->last_ctrl + HZ * 5))
+                        usb_unlink_urb(usbhid->urbctrl);
+        }
 }
 
 void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, unsigned char dir)
@@ -774,7 +798,8 @@ static int hid_alloc_buffers(struct usb_device *dev, struct hid_device *hid)
         return 0;
 }
 
-static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t count)
+static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t count,
+                unsigned char report_type)
 {
         struct usbhid_device *usbhid = hid->driver_data;
         struct usb_device *dev = hid_to_usb_dev(hid);
@@ -785,7 +810,7 @@ static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t co
         ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
                 HID_REQ_SET_REPORT,
                 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-                ((HID_OUTPUT_REPORT + 1) << 8) | *buf,
+                ((report_type + 1) << 8) | *buf,
                 interface->desc.bInterfaceNumber, buf + 1, count - 1,
                 USB_CTRL_SET_TIMEOUT);
 
@@ -981,9 +1006,6 @@ static int usbhid_start(struct hid_device *hid)
 
         spin_lock_init(&usbhid->lock);
 
-        usbhid->intf = intf;
-        usbhid->ifnum = interface->desc.bInterfaceNumber;
-
         usbhid->urbctrl = usb_alloc_urb(0, GFP_KERNEL);
         if (!usbhid->urbctrl) {
                 ret = -ENOMEM;
@@ -1154,6 +1176,8 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *
 
         hid->driver_data = usbhid;
         usbhid->hid = hid;
+        usbhid->intf = intf;
+        usbhid->ifnum = interface->desc.bInterfaceNumber;
 
         ret = hid_add_device(hid);
         if (ret) {
@@ -1342,7 +1366,7 @@ static int hid_reset_resume(struct usb_interface *intf)
 
 #endif /* CONFIG_PM */
 
-static struct usb_device_id hid_usb_ids [] = {
+static const struct usb_device_id hid_usb_ids[] = {
         { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
                 .bInterfaceClass = USB_INTERFACE_CLASS_HID },
         { }                                             /* Terminating entry */