From b5ed13275b6644b41689f794d333b64bbe11d789 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Sat, 26 Nov 2011 14:29:39 +0200
Subject: [PATCH] --- yaml --- r: 284967 b: refs/heads/master c:
 a6b24f83601530f69ee36ac48527336e3c79bea8 h: refs/heads/master i:   284965:
 bd0e74517ead3ca65eadfbf6389dd40de3b0e3f4   284963:
 25ebff488a9c9e2404846a3b5516c9096fc047a1   284959:
 3c8f34b876f8bc3631311da7645a4fba79d5edea v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/video/omap2/dss/apply.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0487bc3d62de..0d590e64e035 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82153eda076ee4df434bb1008f24e46590f76dfc
+refs/heads/master: a6b24f83601530f69ee36ac48527336e3c79bea8
diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c
index c38c015d60e2..ef13fd65fcc1 100644
--- a/trunk/drivers/video/omap2/dss/apply.c
+++ b/trunk/drivers/video/omap2/dss/apply.c
@@ -1025,16 +1025,14 @@ int dss_mgr_enable(struct omap_overlay_manager *mgr)
 	spin_lock_irqsave(&data_lock, flags);
 
 	mp->enabled = true;
+
 	r = dss_check_settings(mgr, mgr->device);
-	mp->enabled = false;
 	if (r) {
 		DSSERR("failed to enable manager %d: check_settings failed\n",
 				mgr->id);
 		goto err;
 	}
 
-	mp->enabled = true;
-
 	dss_mgr_setup_fifos(mgr);
 
 	dss_write_regs();
@@ -1054,6 +1052,7 @@ int dss_mgr_enable(struct omap_overlay_manager *mgr)
 	return 0;
 
 err:
+	mp->enabled = false;
 	spin_unlock_irqrestore(&data_lock, flags);
 	mutex_unlock(&apply_lock);
 	return r;