diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-25 00:35:44 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-25 00:35:43 -0700 |
| commit | 863ccc545e75dbfedd7b3049731fd03b2b0e00f3 (patch) | |
| tree | 2a9fccff08e98977b366159989b21776ef0f186c | |
| parent | 3b3a95fafe127107c7a189963ac823c5539d87d9 (diff) | |
| parent | 3e268eebd0401604b658925816d01a79ad783597 (diff) | |
Merge "USB: policy_engine: Enable VBUS after VCONN before PE_SRC_Startup"
| -rw-r--r-- | drivers/usb/pd/policy_engine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/pd/policy_engine.c b/drivers/usb/pd/policy_engine.c index 3f1c2b32abb8..0cbe95304417 100644 --- a/drivers/usb/pd/policy_engine.c +++ b/drivers/usb/pd/policy_engine.c @@ -1702,7 +1702,6 @@ static void usbpd_sm(struct work_struct *w) if (pd->current_pr == PR_SINK) { usbpd_set_state(pd, PE_SNK_STARTUP); } else if (pd->current_pr == PR_SRC) { - enable_vbus(pd); if (!pd->vconn_enabled && pd->typec_mode == POWER_SUPPLY_TYPEC_SINK_POWERED_CABLE) { @@ -1712,6 +1711,7 @@ static void usbpd_sm(struct work_struct *w) else pd->vconn_enabled = true; } + enable_vbus(pd); usbpd_set_state(pd, PE_SRC_STARTUP); } |