diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-27 18:12:14 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-27 18:12:14 -0700 |
| commit | 19827f9f2e46913dc1c4e0adc449e67970a68069 (patch) | |
| tree | d262679e2ee4a7378cc09acf79c92a0111bf63f0 | |
| parent | d11a00dbfa74cb0d6939a9ba1014d384080cddac (diff) | |
| parent | 9e8ba0aa51a74f0a6f75e8e7448fc2bcf3a8d4cf (diff) | |
Merge "msm: mdss: Call regulator enable/disable for both DSI controllers"
| -rw-r--r-- | drivers/video/fbdev/msm/msm_mdss_io_8974.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/msm_mdss_io_8974.c b/drivers/video/fbdev/msm/msm_mdss_io_8974.c index 690d74fa5271..80dbe83972d7 100644 --- a/drivers/video/fbdev/msm/msm_mdss_io_8974.c +++ b/drivers/video/fbdev/msm/msm_mdss_io_8974.c @@ -2693,7 +2693,8 @@ int mdss_dsi_pre_clkon_cb(void *priv, for (i = DSI_CORE_PM; i < DSI_MAX_PM; i++) { if ((ctrl->ctrl_state & CTRL_STATE_DSI_ACTIVE) && (!pdata->panel_info.cont_splash_enabled) && - (!sdata->power_data[i].vreg_config->disabled)) + (!sdata->power_data[i].vreg_config + ->lp_disable_allowed)) continue; rc = msm_dss_enable_vreg( sdata->power_data[i].vreg_config, |