diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:42:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:42:04 +0200 |
| commit | 8cdfd068c1ea54cca7d7ad6ad31335cc5d0d9905 (patch) | |
| tree | 26a36ec23067a9e26baf3d46c65f70619ca4d808 /drivers/usb/core | |
| parent | usb: introduce usb_ep_type_string() function (diff) | |
| parent | Linux 5.1-rc3 (diff) | |
| download | linux-8cdfd068c1ea54cca7d7ad6ad31335cc5d0d9905.tar.gz linux-8cdfd068c1ea54cca7d7ad6ad31335cc5d0d9905.zip | |
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>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/hcd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 35f7e5fdf4da..00655424baf5 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -2729,6 +2729,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; retval = usb_phy_roothub_power_on(hcd->phy_roothub); |