OMAP: DSS2: check for manager when enabling display

[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 635cc002a4382983bc189fb16ad49987eb8275a6..376732339efe57bc2b87e21618bcfe6fa29ffa43 100644 (file)
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -1231,6 +1231,12 @@ int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)
 
        mutex_lock(&hdmi.lock);
 
+       if (dssdev->manager == NULL) {
+               DSSERR("failed to enable display: no manager\n");
+               r = -ENODEV;
+               goto err0;
+       }
+
        r = omap_dss_start_device(dssdev);
        if (r) {
                DSSERR("failed to start device\n");
@@ -1698,9 +1704,9 @@ static int hdmi_get_clocks(struct platform_device *pdev)
 
        hdmi.sys_clk = clk;
 
-       clk = clk_get(&pdev->dev, "fck");
+       clk = clk_get(&pdev->dev, "dss_48mhz_clk");
        if (IS_ERR(clk)) {
-               DSSERR("can't get fck\n");
+               DSSERR("can't get hdmi_clk\n");
                clk_put(hdmi.sys_clk);
                return PTR_ERR(clk);
        }