diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-06-22 14:56:01 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-06-22 14:56:01 +0300 |
| commit | f778dad38a54ca5207d024b5ebe0e6d71b8bad83 (patch) | |
| tree | b9dc1c84c0052a51ca8ccfba8ab91c26eec6607c /drivers/video/fbdev/omap2/dss/hdmi4.c | |
| parent | a9bd32a8b4c4c2670f9ed8cae63f9378b6df3ded (diff) | |
| parent | a9fad6886f5229fc9989ac6cdd7ddecbf570a58f (diff) | |
| download | linux-f778dad38a54ca5207d024b5ebe0e6d71b8bad83.tar.xz | |
Merge omapdss scaling fixes
Diffstat (limited to 'drivers/video/fbdev/omap2/dss/hdmi4.c')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/hdmi4.c | 2 |
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 d35312d69025..6d3aa3f51c20 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi4.c +++ b/drivers/video/fbdev/omap2/dss/hdmi4.c @@ -230,9 +230,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: |