aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/usb/dwc2/platform.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-02-17 10:37:36 +0100
committerIngo Molnar <mingo@kernel.org>2016-02-17 10:37:36 +0100
commit9109dc97b0155e500cdf3bcd91507bc24defefc1 (patch)
tree5d721cbfeb3576dc6969093ab04f17666737b6a4 /drivers/usb/dwc2/platform.c
parentperf/x86: Move perf_event.h to its new home (diff)
parentperf/core: Plug potential memory leak in CPU_UP_PREPARE (diff)
downloadwireguard-linux-9109dc97b0155e500cdf3bcd91507bc24defefc1.tar.xz
wireguard-linux-9109dc97b0155e500cdf3bcd91507bc24defefc1.zip
Merge branch 'perf/urgent' into perf/core, to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
-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;