summaryrefslogtreecommitdiffstats
path: root/drivers/usb/dwc2/platform.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-04 22:07:23 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-04 22:07:23 +0100
commit207b08b9426dfaa63fcfea4156be0acb5b46ee38 (patch)
tree682172e9380970f183f880b13607a76b876c5c4d /drivers/usb/dwc2/platform.c
parentxhci: Fix list corruption in urb dequeue at host removal (diff)
parentusb: dwc3: gadget: set the OTG flag in dwc3 gadget driver. (diff)
downloadlinux-207b08b9426dfaa63fcfea4156be0acb5b46ee38.tar.xz
linux-207b08b9426dfaa63fcfea4156be0acb5b46ee38.zip
Merge tag 'fixes-for-v4.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes: usb: fixes for v4.5-rc2 DWC3 got a fix for OTG Certification, DWC2 has two fixes for regressions on RasPI, MUSB has a NULL pointer dereference fix for ux500 platforms and two PHYs (MSM and MXS) got some minor fixes. While at that, I'm also adding a fix to my email address which has changed recently.
Diffstat (limited to 'drivers/usb/dwc2/platform.c')
-rw-r--r--drivers/usb/dwc2/platform.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index 510f787434b3..690b9fd98b55 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -530,7 +530,13 @@ static int dwc2_driver_probe(struct platform_device *dev)
if (retval)
return retval;
- /* Reset the controller and detect hardware config values */
+ /*
+ * Reset before dwc2_get_hwparams() then it could get power-on real
+ * reset value form registers.
+ */
+ dwc2_core_reset_and_force_dr_mode(hsotg);
+
+ /* Detect config values from hardware */
retval = dwc2_get_hwparams(hsotg);
if (retval)
goto error;