diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-11-26 14:29:39 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-12-02 08:54:58 +0200 |
| commit | a6b24f83601530f69ee36ac48527336e3c79bea8 (patch) | |
| tree | 125fee0a1626dc0374d41c552d50426f948de387 /drivers/video/omap2/dss/apply.c | |
| parent | 82153eda076ee4df434bb1008f24e46590f76dfc (diff) | |
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>
Diffstat (limited to 'drivers/video/omap2/dss/apply.c')
| -rw-r--r-- | drivers/video/omap2/dss/apply.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index c38c015d60e..ef13fd65fcc 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/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 @@ out: return 0; err: + mp->enabled = false; spin_unlock_irqrestore(&data_lock, flags); mutex_unlock(&apply_lock); return r; |