summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev
diff options
context:
space:
mode:
authorSiddhartha Agrawal <agrawals@codeaurora.org>2015-08-31 17:45:15 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 20:45:22 -0700
commit0ff3b56b25cfcccbf90952a634870cb947a3c8dc (patch)
tree8c3f7b2173c937298b428ce254a305063f3f9b25 /drivers/video/fbdev
parent70199126ff3ceb474ddec74c5c0d41b4971bbd51 (diff)
msm: dsi: fix dsi clock errors if ulps is disabled
Correctly setup the proper return value in case the ulps feature is disabled. If the ulps is disabled, the dsi clock functions return an error causing a bootup failure. Change-Id: I2650957a5d955f66b31bc1c5f373c146efc5c23b Signed-off-by: Siddhartha Agrawal <agrawals@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev')
-rw-r--r--drivers/video/fbdev/msm/msm_mdss_io_8974.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/video/fbdev/msm/msm_mdss_io_8974.c b/drivers/video/fbdev/msm/msm_mdss_io_8974.c
index 926fe556e19b..0abdcd92fc3a 100644
--- a/drivers/video/fbdev/msm/msm_mdss_io_8974.c
+++ b/drivers/video/fbdev/msm/msm_mdss_io_8974.c
@@ -1089,12 +1089,10 @@ static int mdss_dsi_ulps_config(struct mdss_dsi_ctrl_pdata *ctrl,
pinfo = &pdata->panel_info;
mipi = &pinfo->mipi;
- if (!mdss_dsi_ulps_feature_enabled(pdata) &&
- !pinfo->ulps_suspend_enabled &&
- (pinfo->blank_state != MDSS_PANEL_BLANK_BLANK)) {
- pr_debug("%s: ULPS feature not supported. enable=%d\n",
- __func__, enable);
- return -ENOTSUPP;
+ if (!mdss_dsi_ulps_feature_enabled(pdata) ||
+ !pinfo->ulps_suspend_enabled) {
+ pr_debug("%s: ULPS feature is not enabled\n", __func__);
+ return 0;
}
/*