OMAPDSS: APPLY: add return value to dss_mgr_enable()

[deliverable/linux.git] / drivers / video / omap2 / dss / hdmi.c

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 3262f0f1fa35f395aec7637dc4e61f4fdf5766b1..e245a2bbba9db147307f1e63767ac9b66bc52ee6 100644 (file)
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -269,7 +269,7 @@ static void update_hdmi_timings(struct hdmi_config *cfg,
 unsigned long hdmi_get_pixel_clock(void)
 {
        /* HDMI Pixel Clock in Mhz */
-       return hdmi.ip_data.cfg.timings.timings.pixel_clock * 10000;
+       return hdmi.ip_data.cfg.timings.timings.pixel_clock * 1000;
 }
 
 static void hdmi_compute_pll(struct omap_dss_device *dssdev, int phy,
@@ -333,7 +333,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
        if (r)
                return r;
 
-       dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 0);
+       dss_mgr_disable(dssdev->manager);
 
        p = &dssdev->panel.timings;
 
@@ -387,7 +387,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
 
        hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 1);
 
-       dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 1);
+       dss_mgr_enable(dssdev->manager);
 
        return 0;
 err:
@@ -397,7 +397,7 @@ err:
 
 static void hdmi_power_off(struct omap_dss_device *dssdev)
 {
-       dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 0);
+       dss_mgr_disable(dssdev->manager);
 
        hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 0);
        hdmi.ip_data.ops->phy_disable(&hdmi.ip_data);