HID: usbhid: check for suspend or reset before restarting

This patch (as1596) improves the queue-restart logic in usbhid by
checking to see if the device is suspended or a reset is about to
occur.  There's no point submitting an URB if either of those is
true.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: Oliver Neukum <oliver@neukum.org>
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 271578b85d914423d0725c2ab05b3243fc1eb04c..4309c03038f6cf8b3acd4f692ebbd0f8c07432c3 100644 (file)
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -207,7 +207,8 @@ static int usbhid_restart_out_queue(struct usbhid_device *usbhid)
        int kicked;
        int r;
 
-       if (!hid)
+       if (!hid || test_bit(HID_RESET_PENDING, &usbhid->iofl) ||
+                       test_bit(HID_SUSPENDED, &usbhid->iofl))
                return 0;
 
        if ((kicked = (usbhid->outhead != usbhid->outtail))) {
@@ -245,7 +246,8 @@ static int usbhid_restart_ctrl_queue(struct usbhid_device *usbhid)
        int r;
 
        WARN_ON(hid == NULL);
-       if (!hid)
+       if (!hid || test_bit(HID_RESET_PENDING, &usbhid->iofl) ||
+                       test_bit(HID_SUSPENDED, &usbhid->iofl))
                return 0;
 
        if ((kicked = (usbhid->ctrlhead != usbhid->ctrltail))) {