commit 19191fdce8692e67498906d2fa29b69f4db93e71
author Linux Build Service Account <lnxbuild@localhost> Mon Feb 19 07:51:50 2018 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Feb 19 07:51:50 2018 -0800
tree 494adb28b7b981f8b16536f42261e6f7e9a21154
parent d8100119f9b1dd3b4bbd97e5df8f263c7e125999
parent a45b5722e9f9d0a14e0847e8563dba94799f6104

Merge "usb: dwc3-msm: Initialize mutex before registering extcon"

drivers/usb/dwc3/dwc3-msm.c

diff --git a/drivers/usb/dwc3/dwc3-msm.c b/drivers/usb/dwc3/dwc3-msm.c
index 89bf6b7..a91dceb0 100644
--- a/drivers/usb/dwc3/dwc3-msm.c
+++ b/drivers/usb/dwc3/dwc3-msm.c
@@ -3518,6 +3518,7 @@
 	mdwc->no_vbus_vote_type_c = of_property_read_bool(node,
 					"qcom,no-vbus-vote-with-type-C");
 
+	mutex_init(&mdwc->suspend_resume_mutex);
 	/* Mark type-C as true by default */
 	mdwc->type_c = true;
 
@@ -3543,7 +3544,6 @@
 	if (ret)
 		goto put_psy;
 
-	mutex_init(&mdwc->suspend_resume_mutex);
 	/* Update initial VBUS/ID state from extcon */
 	if (mdwc->extcon_vbus && extcon_get_state(mdwc->extcon_vbus,
 							EXTCON_USB))