summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbdev/omap2
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-03-24 14:46:33 +0100
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-06-17 14:44:29 +0200
commit9bba13f0d74cea808f417370961bb3421a09bcb6 (patch)
tree76eaef9b429483a38549cb2e2d0c578960d1629b /drivers/video/fbdev/omap2
parentOMAPDSS: DISPC: scaler debug print (diff)
downloadlinux-9bba13f0d74cea808f417370961bb3421a09bcb6.tar.xz
linux-9bba13f0d74cea808f417370961bb3421a09bcb6.zip
OMAPDSS: HDMI4: fix error handling
Error handling in hdmi_power_on_full() is not correct, and could leave resources unfreed. Fix this by arranging the error labels correctly. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/fbdev/omap2')
-rw-r--r--drivers/video/fbdev/omap2/dss/hdmi4.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/omap2/dss/hdmi4.c b/drivers/video/fbdev/omap2/dss/hdmi4.c
index 916d47978f41..e1345abd41bb 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi4.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi4.c
@@ -229,9 +229,9 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
err_mgr_enable:
hdmi_wp_video_stop(&hdmi.wp);
err_vid_enable:
-err_phy_cfg:
hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);
err_phy_pwr:
+err_phy_cfg:
err_pll_cfg:
dss_pll_disable(&hdmi.pll.pll);
err_pll_enable: