diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
index 0da8081fc7c439b9309ff5f09bf5fb41031d300c..7919ff38474926fa6332bd5f6c52d2b0e8eaa3d3 100644
--- a/drivers/video/omap2/dss/apply.c
+++ b/drivers/video/omap2/dss/apply.c
@@ -629,7 +629,7 @@ int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
 	}
 
 	r = 0;
-	if (!mgr_manual_update(mgr)) {
+	if (mgr->enabled && !mgr_manual_update(mgr)) {
 		if (!dss_cache.irq_enabled) {
 			u32 mask;