summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-12-29 14:51:28 +0800
committerSebastien Jan <s-jan@ti.com>2012-01-06 16:41:26 +0100
commit296e4c2d59f82b408f1c76e1b4e26fb12169cc2c (patch)
treebdd5d3add1024ae67d822d8718a590be372eb617 /drivers
parenta5bf15f0b5c4aca34ff644bf191957f0c5fb356b (diff)
omap dss manager dont apply if still suspended
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/omap2/dss/manager.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index e5684a9d6723..0fa3ba663497 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -1341,6 +1341,9 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
DSSDBG("omap_dss_mgr_apply(%s)\n", mgr->name);
+ if (!dss_runtime_pm_enabled())
+ return -EAGAIN;
+
r = dispc_runtime_get();
if (r)
return r;