---

yaml --- r: 284919 b: refs/heads/master c: 04f6643 h: refs/heads/master i: 284917: 855885e 284915: c94ac88 284911: 03df3c1 v: v3
git-mirror · Dec 2, 2011 · 920f228 · 920f228
1 parent 642220b
commit 920f228
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18135eadac6f0fd1bf61b7af24f14e7174155e6d
+refs/heads/master: 04f6643a8657bd080344d2928dde917e0b1b3800
diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c
@@ -629,7 +629,7 @@ int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
 	}
 
 	r = 0;
-	if (!mgr_manual_update(mgr)) {
+	if (mgr->enabled && !mgr_manual_update(mgr)) {
 		if (!dss_cache.irq_enabled) {
 			u32 mask;