---

yaml --- r: 284974 b: refs/heads/master c: 00f17e4 h: refs/heads/master v: v3
git-mirror · Jan 2, 2012 · b1dcb60 · b1dcb60
1 parent 9cc97f2
commit b1dcb60
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f806f9b6b8ec2c8b6a3297e684bcb80f54e3dc98
+refs/heads/master: 00f17e4560da32db454c46faf1e8df4fe35cc226
diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c
@@ -3201,7 +3201,8 @@ static void dispc_error_worker(struct work_struct *work)
 		for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
 			struct omap_overlay_manager *mgr;
 			mgr = omap_dss_get_overlay_manager(i);
-			mgr->device->driver->disable(mgr->device);
+			if (mgr->device && mgr->device->driver)
+				mgr->device->driver->disable(mgr->device);
 		}
 	}