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

Commit fbaecff0 authored by Deepak Das's avatar Deepak Das Committed by Greg Kroah-Hartman
Browse files

usb: core: hub: modify hub reset logic in hub driver 



Currently if port power is turned off by user on hub port
using USBDEVFS then port power is turned back ON
by hub driver.
This commit modifies hub reset logic in hub_port_connect() to prevent
hub driver from turning back the port power ON if port is not owned
by kernel.

Signed-off-by: default avatarDeepak Das <deepakdas.linux@gmail.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7e7a0e67

drivers/usb/core/hub.c

+6 −2
Original line number Diff line number Diff line
@@ -4655,9 +4655,13 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, 
	if (!(portstatus & USB_PORT_STAT_CONNECTION) ||

			test_bit(port1, hub->removed_bits)) {



		/* maybe switch power back on (e.g. root hub was reset) */

		/*

		 * maybe switch power back on (e.g. root hub was reset)

		 * but only if the port isn't owned by someone else.

		 */

		if (hub_is_port_power_switchable(hub)

				&& !port_is_power_on(hub, portstatus))

				&& !port_is_power_on(hub, portstatus)

				&& !port_dev->port_owner)

			set_port_feature(hdev, port1, USB_PORT_FEAT_POWER);



		if (portstatus & USB_PORT_STAT_ENABLE)