summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-11-26 21:27:50 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-11-26 21:27:50 -0800
commitd0fd03a2cf02a46b343329c8dd6f7df346a0fa0a (patch)
tree2afef08bab51a60aababb03cc96d82c4743bb38d
parent5b3053ec2456e6f9bdedda0a181dfd657fb1210b (diff)
parent2a1e72fbbc84789ebda1fa406d5bd9ee920b621b (diff)
Merge "usb: dwc3-msm: Fix restart usb work functionality"
-rw-r--r--drivers/usb/dwc3/dwc3-msm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/dwc3/dwc3-msm.c b/drivers/usb/dwc3/dwc3-msm.c
index add035269ae7..de6cb6c6df05 100644
--- a/drivers/usb/dwc3/dwc3-msm.c
+++ b/drivers/usb/dwc3/dwc3-msm.c
@@ -1967,7 +1967,7 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc)
clk_disable_unprepare(mdwc->xo_clk);
/* Perform controller power collapse */
- if (!mdwc->in_host_mode && !mdwc->vbus_active) {
+ if (!mdwc->in_host_mode && (!mdwc->vbus_active || mdwc->in_restart)) {
mdwc->lpm_flags |= MDWC3_POWER_COLLAPSE;
dev_dbg(mdwc->dev, "%s: power collapse\n", __func__);
dwc3_msm_config_gdsc(mdwc, 0);