Commit 2d51f3cd authored by Julius Werner's avatar Julius Werner Committed by Greg Kroah-Hartman

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: default avatarJulius Werner <jwerner@chromium.org>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9876388e
...@@ -4832,8 +4832,9 @@ static void hub_events(void) ...@@ -4832,8 +4832,9 @@ static void hub_events(void)
hub->ports[i - 1]->child; hub->ports[i - 1]->child;
dev_dbg(hub_dev, "warm reset port %d\n", i); dev_dbg(hub_dev, "warm reset port %d\n", i);
if (!udev || !(portstatus & if (!udev ||
USB_PORT_STAT_CONNECTION)) { !(portstatus & USB_PORT_STAT_CONNECTION) ||
udev->state == USB_STATE_NOTATTACHED) {
status = hub_port_reset(hub, i, status = hub_port_reset(hub, i,
NULL, HUB_BH_RESET_TIME, NULL, HUB_BH_RESET_TIME,
true); true);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment