Skip to content

Commit

Permalink
OMAPDSS: APPLY: simplify dss_mgr_enable
Browse files Browse the repository at this point in the history
dss_mgr_enable() has some extra assigns to mp->enabled, which can be
removed.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Tomi Valkeinen committed Dec 2, 2011
1 parent 82153ed commit a6b24f8
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/video/omap2/dss/apply.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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;
Expand Down

0 comments on commit a6b24f8

Please sign in to comment.