Commit a6b24f83 authored by Tomi Valkeinen's avatar Tomi Valkeinen

OMAPDSS: APPLY: simplify dss_mgr_enable

dss_mgr_enable() has some extra assigns to mp->enabled, which can be
removed.
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 82153eda
...@@ -1025,16 +1025,14 @@ int dss_mgr_enable(struct omap_overlay_manager *mgr) ...@@ -1025,16 +1025,14 @@ int dss_mgr_enable(struct omap_overlay_manager *mgr)
spin_lock_irqsave(&data_lock, flags); spin_lock_irqsave(&data_lock, flags);
mp->enabled = true; mp->enabled = true;
r = dss_check_settings(mgr, mgr->device); r = dss_check_settings(mgr, mgr->device);
mp->enabled = false;
if (r) { if (r) {
DSSERR("failed to enable manager %d: check_settings failed\n", DSSERR("failed to enable manager %d: check_settings failed\n",
mgr->id); mgr->id);
goto err; goto err;
} }
mp->enabled = true;
dss_mgr_setup_fifos(mgr); dss_mgr_setup_fifos(mgr);
dss_write_regs(); dss_write_regs();
...@@ -1054,6 +1052,7 @@ int dss_mgr_enable(struct omap_overlay_manager *mgr) ...@@ -1054,6 +1052,7 @@ int dss_mgr_enable(struct omap_overlay_manager *mgr)
return 0; return 0;
err: err:
mp->enabled = false;
spin_unlock_irqrestore(&data_lock, flags); spin_unlock_irqrestore(&data_lock, flags);
mutex_unlock(&apply_lock); mutex_unlock(&apply_lock);
return r; return r;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment