On Thu, 7 Nov 2013, Julius Werner wrote:

> 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 <[email protected]>
> ---
>  drivers/usb/core/hub.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
> index e6b682c..0188056 100644
> --- a/drivers/usb/core/hub.c
> +++ b/drivers/usb/core/hub.c
> @@ -4799,8 +4799,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);

Acked-by: Alan Stern <[email protected]>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to