From: Dan Williams Date: Mon, 7 Oct 2013 18:58:20 +0000 (-0700) Subject: usb: hub_activate kill an 'else' X-Git-Tag: accepted/tizen/common/20141203.182822~1210^2~32^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd1ac4cf524018198373c5eb90ca0e7968c5bbb8;p=platform%2Fkernel%2Flinux-arm64.git usb: hub_activate kill an 'else' Remove a few extra lines and make it clear that all implementations disable the port by sharing the same line of code. Acked-by: Alan Stern Signed-off-by: Dan Williams Signed-off-by: Sarah Sharp --- diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 566ac55..3da6074 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1112,16 +1112,13 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) /* * USB3 protocol ports will automatically transition * to Enabled state when detect an USB3.0 device attach. - * Do not disable USB3 protocol ports. + * Do not disable USB3 protocol ports, just pretend + * power was lost */ - if (!hub_is_superspeed(hdev)) { + portstatus &= ~USB_PORT_STAT_ENABLE; + if (!hub_is_superspeed(hdev)) usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_ENABLE); - portstatus &= ~USB_PORT_STAT_ENABLE; - } else { - /* Pretend that power was lost for USB3 devs */ - portstatus &= ~USB_PORT_STAT_ENABLE; - } } /* Clear status-change flags; we'll debounce later */