diff options
| author | Ujwal Patel <ujwalp@codeaurora.org> | 2012-10-25 19:30:33 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:13:02 -0700 |
| commit | 22b0adbc2ef99b30ba5bbb7d53b0b468f25b5fd0 (patch) | |
| tree | a94014c91eb236813ac2c3116c633a681fb21365 | |
| parent | fab9e05c7afa26eb8a269de7d2affac7bdcf1095 (diff) | |
msm: mdss: Fix error roll back sequence during core on.
When core power enable fails for some reason, current code disables
hpd power in the roll back which is unnecessary. Correct this mistake.
Change-Id: Ia5ed63edb017ade44950058c9d6071e8eb5d7884
Signed-off-by: Ujwal Patel <ujwalp@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_hdmi_tx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c index 3fa7aa721036..037d2de34ca0 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c @@ -1173,7 +1173,7 @@ static int hdmi_tx_core_on(struct hdmi_tx_ctrl *hdmi_ctrl) if (rc) { DEV_ERR("%s: core hdmi_msm_enable_power failed rc = %d\n", __func__, rc); - goto disable_hpd_power; + return rc; } rc = hdmi_tx_enable_power(hdmi_ctrl, HDMI_TX_CEC_PM, 1); if (rc) { @@ -1185,8 +1185,6 @@ static int hdmi_tx_core_on(struct hdmi_tx_ctrl *hdmi_ctrl) return rc; disable_core_power: hdmi_tx_enable_power(hdmi_ctrl, HDMI_TX_CORE_PM, 0); -disable_hpd_power: - hdmi_tx_enable_power(hdmi_ctrl, HDMI_TX_HPD_PM, 0); return rc; } /* hdmi_tx_core_on */ |