Skip to contentSkip to conversation

Patch "HID: usbhid: Fix the check for HID_RESET_PENDING in hid_io_error" has been added to the 3.14-stable tree

PATCH [email protected] 1 participant 1 message Sep 17, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

HID: usbhid: Fix the check for HID_RESET_PENDING in hid_io_error

to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
hid-usbhid-fix-the-check-for-hid_reset_pending-in-hid_io_error.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 3af4e5a95184d6d3c1c6a065f163faa174a96a1d Mon Sep 17 00:00:00 2001

From: Don Zickus <[email protected]>
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 <[email protected]>

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.

---
 drivers/hid/usbhid/hid-core.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/usbhid/hid-core.c +1 -1
@@ -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);

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/hid-usbhid-fix-the-check-for-hid_reset_pending-in-hid_io_error.patch