---

yaml --- r: 284979 b: refs/heads/master c: 1f3f53a h: refs/heads/master i: 284977: 4063b05 284975: 95deea6 v: v3
git-mirror · Jan 2, 2012 · 76200ea · 76200ea
1 parent e8a5640
commit 76200ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ea9b31792745ee620509930dc9eead6e1c4be25
+refs/heads/master: 1f3f53ae5179ba7f24b4a429bc41773f1f4857ca
diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c
@@ -327,6 +327,9 @@ static bool extra_info_update_ongoing(void)
 		ovl = omap_dss_get_overlay(i);
 		op = get_ovl_priv(ovl);
 
+		if (!ovl->manager)
+			continue;
+
 		mp = get_mgr_priv(ovl->manager);
 
 		if (!mp->enabled)