OSDN Git Service

OMAPDSS: HDMI4: fix error handling
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 24 Mar 2015 13:46:33 +0000 (15:46 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 17 Jun 2015 12:44:29 +0000 (15:44 +0300)
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>
drivers/video/fbdev/omap2/dss/hdmi4.c

index 916d479..e1345ab 100644 (file)
@@ -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: