diff options
| author | Andy Green <andy.green@linaro.org> | 2011-11-29 08:19:06 +0800 |
|---|---|---|
| committer | Sebastien Jan <s-jan@ti.com> | 2011-12-05 11:18:46 +0100 |
| commit | 59e0e411959647f206b9d7c44cceaa2993ffd522 (patch) | |
| tree | 0298ff147b141ee1f35648542fb5fa662694ba67 /drivers | |
| parent | 42b5c7b7ce7cf1113b84a5407580aafcde1ed833 (diff) | |
fix dss hdmi and hdmi ip driver both owning hdmi clock
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/omap2/dss/dispc.c | 4 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/dss.c | 5 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/hdmi.c | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index cc21e0499a62..9c93aeae62af 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -3451,8 +3451,10 @@ static int dispc_runtime_resume(struct device *dev) int r; r = dss_runtime_get(); - if (r < 0) + if (r < 0) { + pr_err("dispc_runtime_resume: unable to get dss\n"); return r; + } dispc_restore_context(); diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index db40665ff6c3..bc2b596f41d7 100644 --- a/drivers/video/omap2/dss/dss.c +++ b/drivers/video/omap2/dss/dss.c @@ -713,7 +713,10 @@ int dss_runtime_get(void) DSSDBG("dss_runtime_get\n"); r = pm_runtime_get_sync(&dss.pdev->dev); - WARN_ON(r < 0); + if (r < 0) { + pr_err("dss_runtime_get: failed %d\n", r); + WARN_ON(1); + } return r < 0 ? r : 0; } diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index b4ac7a14e39e..01b88587e824 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -825,7 +825,7 @@ static int omapdss_hdmihw_remove(struct platform_device *pdev) static int hdmi_runtime_suspend(struct device *dev) { - clk_disable(hdmi.sys_clk); +// clk_disable(hdmi.sys_clk); dispc_runtime_put(); dss_runtime_put(); @@ -846,7 +846,7 @@ static int hdmi_runtime_resume(struct device *dev) goto err_get_dispc; - clk_enable(hdmi.sys_clk); +// clk_enable(hdmi.sys_clk); return 0; |