Commit 2d51f3cd authored Nov 07, 2013 by Julius Werner Committed by Greg Kroah-Hartman Dec 04, 2013

usb: hub: Use correct reset for wedged USB3 devices that are NOTATTACHED



This patch adds a check for USB_STATE_NOTATTACHED to the
hub_port_warm_reset_required() workaround for ports that end up in
Compliance Mode in hub_events() when trying to decide which reset
function to use. Trying to call usb_reset_device() with a NOTATTACHED
device will just fail and leave the port broken.

Signed-off-by: Julius Werner <jwerner@chromium.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9876388e

drivers/usb/core/hub.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -4832,8 +4832,9 @@ static void hub_events(void)
		hub->ports[i - 1]->child;

		dev_dbg(hub_dev, "warm reset port %d\n", i);
		if (!udev \|\| !(portstatus &
		USB_PORT_STAT_CONNECTION)) {
		if (!udev \|\|
		!(portstatus & USB_PORT_STAT_CONNECTION) \|\|
		udev->state == USB_STATE_NOTATTACHED) {
		status = hub_port_reset(hub, i,
		NULL, HUB_BH_RESET_TIME,
		true);

Admin message