提交 d3b4aa51 编写于 作者: R Ricardo Neri 提交者: Tomi Valkeinen

OMAPDSS: HDMI: Disable PLL properly in case of error at power_on

Small patch to disable the PLL appropriately before runtime_put in case
an error occurs while enabling the PHY.
Signed-off-by: NRicardo Neri <ricardo.neri@ti.com>
Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
上级 974a6582
...@@ -501,7 +501,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev) ...@@ -501,7 +501,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
r = hdmi.ip_data.ops->phy_enable(&hdmi.ip_data); r = hdmi.ip_data.ops->phy_enable(&hdmi.ip_data);
if (r) { if (r) {
DSSDBG("Failed to start PHY\n"); DSSDBG("Failed to start PHY\n");
goto err; goto err_phy_enable;
} }
hdmi.ip_data.ops->video_configure(&hdmi.ip_data); hdmi.ip_data.ops->video_configure(&hdmi.ip_data);
...@@ -537,6 +537,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev) ...@@ -537,6 +537,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
hdmi.ip_data.ops->video_disable(&hdmi.ip_data); hdmi.ip_data.ops->video_disable(&hdmi.ip_data);
err_vid_enable: err_vid_enable:
hdmi.ip_data.ops->phy_disable(&hdmi.ip_data); hdmi.ip_data.ops->phy_disable(&hdmi.ip_data);
err_phy_enable:
hdmi.ip_data.ops->pll_disable(&hdmi.ip_data); hdmi.ip_data.ops->pll_disable(&hdmi.ip_data);
err: err:
hdmi_runtime_put(); hdmi_runtime_put();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册