| From 2d51f3cd11f414c56a87dc018196b85fd50b04a4 Mon Sep 17 00:00:00 2001 |
| From: Julius Werner <jwerner@chromium.org> |
| Date: Thu, 7 Nov 2013 10:59:14 -0800 |
| Subject: usb: hub: Use correct reset for wedged USB3 devices that are NOTATTACHED |
| |
| From: Julius Werner <jwerner@chromium.org> |
| |
| commit 2d51f3cd11f414c56a87dc018196b85fd50b04a4 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/core/hub.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/usb/core/hub.c |
| +++ b/drivers/usb/core/hub.c |
| @@ -3891,8 +3891,9 @@ static void hub_events(void) |
| hub->hdev->children[i - 1]; |
| |
| 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); |
