Merge 5.1-rc3 into usb-next

We want the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-04-01 07:42:04 +02:00
parent 4d537f37e0 79a3aaa7b8
commit 8cdfd068c1
836 changed files with 11496 additions and 9786 deletions
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2728,6 +2728,9 @@ int usb_add_hcd(struct usb_hcd *hcd,

 		retval = usb_phy_roothub_set_mode(hcd->phy_roothub,
 						  PHY_MODE_USB_HOST_SS);
+		if (retval)
+			retval = usb_phy_roothub_set_mode(hcd->phy_roothub,
+							  PHY_MODE_USB_HOST);
 		if (retval)
 			goto err_usb_phy_roothub_power_on;