| From 3af4e5a95184d6d3c1c6a065f163faa174a96a1d Mon Sep 17 00:00:00 2001 |
| From: Don Zickus <dzickus@redhat.com> |
| Date: Mon, 10 Aug 2015 12:06:53 -0400 |
| Subject: HID: usbhid: Fix the check for HID_RESET_PENDING in hid_io_error |
| |
| From: Don Zickus <dzickus@redhat.com> |
| |
| commit 3af4e5a95184d6d3c1c6a065f163faa174a96a1d upstream. |
| |
| It was reported that after 10-20 reboots, a usb keyboard plugged |
| into a docking station would not work unless it was replugged in. |
| |
| Using usbmon, it turns out the interrupt URBs were streaming with |
| callback errors of -71 for some reason. The hid-core.c::hid_io_error was |
| supposed to retry and then reset, but the reset wasn't really happening. |
| |
| The check for HID_NO_BANDWIDTH was inverted. Fix was simple. |
| |
| Tested by reporter and locally by me by unplugging a keyboard halfway until I |
| could recreate a stream of errors but no disconnect. |
| |
| Signed-off-by: Don Zickus <dzickus@redhat.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/hid/usbhid/hid-core.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/hid/usbhid/hid-core.c |
| +++ b/drivers/hid/usbhid/hid-core.c |
| @@ -180,7 +180,7 @@ static void hid_io_error(struct hid_devi |
| if (time_after(jiffies, usbhid->stop_retry)) { |
| |
| /* Retries failed, so do a port reset unless we lack bandwidth*/ |
| - if (test_bit(HID_NO_BANDWIDTH, &usbhid->iofl) |
| + if (!test_bit(HID_NO_BANDWIDTH, &usbhid->iofl) |
| && !test_and_set_bit(HID_RESET_PENDING, &usbhid->iofl)) { |
| |
| schedule_work(&usbhid->reset_work); |
