diff options
| author | Andy Green <andy.green@linaro.org> | 2011-12-29 14:51:28 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-12-29 14:51:28 +0800 |
| commit | 34f905ddcb501e919198031e9ad3d8bda43d69ce (patch) | |
| tree | eb6c1cb989233e6b7cea3bf6ad3b1618b49fbd76 | |
| parent | 416071ebd6f796ad663d98a04f9f300d60999b01 (diff) | |
omap dss manager dont apply if still suspended
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | drivers/video/omap2/dss/manager.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c index e5684a9d672..0fa3ba66349 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; |