* [PATCH] OMAPDSS: HDMI: Disable PLL properly in case of error at power_on
@ 2012-07-31 0:12 Ricardo Neri
2012-07-31 8:50 ` Tomi Valkeinen
0 siblings, 1 reply; 2+ messages in thread
From: Ricardo Neri @ 2012-07-31 0:12 UTC (permalink / raw)
To: tomi.valkeinen; +Cc: archit, s-guiriec, linux-omap, Ricardo Neri
Small patch to disable the PLL appropriately before runtime_put in case
an error occurs while enabling the PHY.
Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
---
drivers/video/omap2/dss/hdmi.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 060216f..a65dafa 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -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 @@ err_mgr_enable:
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();
--
1.7.5.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] OMAPDSS: HDMI: Disable PLL properly in case of error at power_on
2012-07-31 0:12 [PATCH] OMAPDSS: HDMI: Disable PLL properly in case of error at power_on Ricardo Neri
@ 2012-07-31 8:50 ` Tomi Valkeinen
0 siblings, 0 replies; 2+ messages in thread
From: Tomi Valkeinen @ 2012-07-31 8:50 UTC (permalink / raw)
To: Ricardo Neri; +Cc: archit, s-guiriec, linux-omap
[-- Attachment #1: Type: text/plain, Size: 368 bytes --]
On Mon, 2012-07-30 at 19:12 -0500, Ricardo Neri wrote:
> Small patch to disable the PLL appropriately before runtime_put in case
> an error occurs while enabling the PHY.
>
> Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
> ---
> drivers/video/omap2/dss/hdmi.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
Thanks, applied.
Tomi
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-31 8:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-31 0:12 [PATCH] OMAPDSS: HDMI: Disable PLL properly in case of error at power_on Ricardo Neri
2012-07-31 8:50 ` Tomi Valkeinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox