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

Commit 9ce4f80f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "USB: Reset USB 3.0 devices on (re)discovery" 



This reverts commit 637d11bf.  Sarah
wants to tweak it some more before it's applied to the tree.

Cc: Luben Tuikov <ltuikov@yahoo.com>
Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent dd305ad4

drivers/usb/core/hub.c

+11 −7
Original line number Diff line number Diff line
@@ -2681,13 +2681,17 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, 


	mutex_lock(&usb_address0_mutex);



	if (!udev->config && oldspeed == USB_SPEED_SUPER) {

		/* Don't reset USB 3.0 devices during an initial setup */

		usb_set_device_state(udev, USB_STATE_DEFAULT);

	} else {

		/* Reset the device; full speed may morph to high speed */

		/* FIXME a USB 2.0 device may morph into SuperSpeed on reset. */

		retval = hub_port_reset(hub, port1, udev, delay);

		if (retval < 0)		/* error or disconnect */

			goto fail;

		/* success, speed is known */



	}

	retval = -ENODEV;



	if (oldspeed != USB_SPEED_UNKNOWN && oldspeed != udev->speed) {