---

yaml --- r: 271361 b: refs/heads/master c: 0f770b4 h: refs/heads/master i: 271359: 475eba0 v: v3
git-mirror · Sep 14, 2011 · 534ad5d · 534ad5d
1 parent 2a77b56
commit 534ad5d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05e1d6060743e34e3a9db65346168dc688f9223e
+refs/heads/master: 0f770b4765846846cc531f6828fb8402f92e2649
diff --git a/trunk/drivers/video/omap2/dss/manager.c b/trunk/drivers/video/omap2/dss/manager.c
@@ -586,6 +586,13 @@ static int omap_dss_unset_device(struct omap_overlay_manager *mgr)
 		return -EINVAL;
 	}
 
+	/*
+	 * Don't allow currently enabled displays to have the overlay manager
+	 * pulled out from underneath them
+	 */
+	if (mgr->device->state != OMAP_DSS_DISPLAY_DISABLED)
+		return -EINVAL;
+
 	mgr->device->manager = NULL;
 	mgr->device = NULL;
 	mgr->device_changed = true;