OMAPDSS: APPLY: simplify dss_mgr_enable

dss_mgr_enable() has some extra assigns to mp->enabled, which can be
removed.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Tomi Valkeinen 2011-11-26 14:29:39 +02:00
parent 82153eda07
commit a6b24f8360

View File

@ -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 @@ out:
return 0;
err:
mp->enabled = false;
spin_unlock_irqrestore(&data_lock, flags);
mutex_unlock(&apply_lock);
return r;