diff --git a/[refs] b/[refs]
index b07a8630b677..fe8948db1344 100644
--- 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
index 13d72d5c714b..63674b054d35 100644
--- 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;