Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd1ac4cf authored by Dan Williams's avatar Dan Williams Committed by Sarah Sharp
Browse files

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: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent c69a0597

drivers/usb/core/hub.c

+4 −7
Original line number Diff line number Diff line
@@ -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 */