diff --git a/[refs] b/[refs]
index 436c7402c160..096064491e32 100644
--- 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
index 0a6fb8de19c0..052dc874cd3d 100644
--- 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)