---

yaml --- r: 284967 b: refs/heads/master c: a6b24f8 h: refs/heads/master i: 284965: bd0e745 284963: 25ebff4 284959: 3c8f34b v: v3
git-mirror · Dec 2, 2011 · b5ed132 · b5ed132
1 parent 5a56a24
commit b5ed132
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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;