From bd0e74517ead3ca65eadfbf6389dd40de3b0e3f4 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Fri, 25 Nov 2011 17:35:35 +0200
Subject: [PATCH] --- yaml --- r: 284965 b: refs/heads/master c:
 153b6e7357778267e6914f2370a059e79a751371 h: refs/heads/master i:   284963:
 25ebff488a9c9e2404846a3b5516c9096fc047a1 v: v3

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

diff --git a/[refs] b/[refs]
index 8ada2356a2f3..c6b13cbbfa72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ab15b2aa70369e0360f12e35e47bca1a269138b
+refs/heads/master: 153b6e7357778267e6914f2370a059e79a751371
diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c
index f54c17f849b7..b6e608386219 100644
--- a/trunk/drivers/video/omap2/dss/apply.c
+++ b/trunk/drivers/video/omap2/dss/apply.c
@@ -426,7 +426,6 @@ static bool extra_info_update_ongoing(void)
 	struct omap_overlay *ovl;
 	struct mgr_priv_data *mp;
 	int i;
-	bool eid;
 
 	for (i = 0; i < num_ovls; ++i) {
 		ovl = omap_dss_get_overlay(i);
@@ -437,15 +436,11 @@ static bool extra_info_update_ongoing(void)
 		if (!mp->enabled)
 			continue;
 
-		eid = op->extra_info_dirty || op->shadow_extra_info_dirty;
-
-		if (!eid)
-			continue;
-
-		if (ovl_manual_update(ovl) && !mp->updating)
+		if (!mp->updating)
 			continue;
 
-		return true;
+		if (op->extra_info_dirty || op->shadow_extra_info_dirty)
+			return true;
 	}
 
 	return false;