From 920f228101fec3d98b30a9d8218a4136f1816294 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Mon, 7 Nov 2011 15:04:01 +0200
Subject: [PATCH] --- yaml --- r: 284919 b: refs/heads/master c:
 04f6643a8657bd080344d2928dde917e0b1b3800 h: refs/heads/master i:   284917:
 855885ec778aba302aa08f5d6ed293a18c274232   284915:
 c94ac88df35ba210039fc6433627f5bc2b5fd767   284911:
 03df3c190e9547a05428446e477f8e4f4743c397 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/video/omap2/dss/apply.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0882f1785b83..09582a98c7ba 100644
--- 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
index 0da8081fc7c4..7919ff384749 100644
--- 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;