Merge remote-tracking branch 'als/oneplus/QC8998_O_8.1' into 8.1.0-un…

…ified * als/oneplus/QC8998_O_8.1: Fix headset issue. Add display improvement. ANDROID: binder: don't enqueue death notifications to thread todo. Signed-off-by: Nathan Chancellor <[email protected]>
nathanchance · Apr 25, 2018 · 789a57b · 789a57b
2 parents 1ca4cc1 + 04111a6
commit 789a57b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/usb/dwc3/dwc3-msm.c b/drivers/usb/dwc3/dwc3-msm.c
@@ -3466,6 +3466,7 @@ static int dwc3_otg_start_host(struct dwc3_msm *mdwc, int on)
 	if (on) {
 		dev_dbg(mdwc->dev, "%s: turn on host\n", __func__);
 
+		pm_runtime_get_sync(mdwc->dev);
 		mdwc->hs_phy->flags |= PHY_HOST_MODE;
 		if (dwc->maximum_speed == USB_SPEED_SUPER) {
 			mdwc->ss_phy->flags |= PHY_HOST_MODE;
@@ -3474,7 +3475,6 @@ static int dwc3_otg_start_host(struct dwc3_msm *mdwc, int on)
 		}
 
 		usb_phy_notify_connect(mdwc->hs_phy, USB_SPEED_HIGH);
-		pm_runtime_get_sync(mdwc->dev);
 		dbg_event(0xFF, "StrtHost gync",
 			atomic_read(&mdwc->dev->power.usage_count));
 		if (!IS_ERR(mdwc->vbus_reg))