Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3b4aa51 authored by Ricardo Neri's avatar Ricardo Neri Committed by Tomi Valkeinen
Browse files

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: default avatarRicardo Neri <ricardo.neri@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 974a6582

drivers/video/omap2/dss/hdmi.c

+2 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev) 
	r = hdmi.ip_data.ops->phy_enable(&hdmi.ip_data);

	if (r) {

		DSSDBG("Failed to start PHY\n");

		goto err;

		goto err_phy_enable;

	}



	hdmi.ip_data.ops->video_configure(&hdmi.ip_data);
@@ -537,6 +537,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev) 
	hdmi.ip_data.ops->video_disable(&hdmi.ip_data);

err_vid_enable:

	hdmi.ip_data.ops->phy_disable(&hdmi.ip_data);

err_phy_enable:

	hdmi.ip_data.ops->pll_disable(&hdmi.ip_data);

err:

	hdmi_runtime_put();