diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-10-19 08:06:07 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-27 05:27:02 -0500 |
commit | 3c91ee8cc9fa785ed9c4ad250d3f293f279153fe (patch) | |
tree | e2d0da999ea1a09c6f251936ab31db3e24b79363 /drivers | |
parent | 916188a46618313eedb07acac00fa575c503ff25 (diff) |
OMAPDSS: DISPC: use WARN_ON() in dispc_mgr_go
dispc_mgr_go() should never be called with manager output disabled or if
the GO bit is already set. Change the current silent returns to
WARN_ONs.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/omap2/dss/dispc.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 942dd16f317d..531961424d33 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c | |||
@@ -569,20 +569,8 @@ bool dispc_mgr_go_busy(enum omap_channel channel) | |||
569 | 569 | ||
570 | void dispc_mgr_go(enum omap_channel channel) | 570 | void dispc_mgr_go(enum omap_channel channel) |
571 | { | 571 | { |
572 | bool enable_bit, go_bit; | 572 | WARN_ON(dispc_mgr_is_enabled(channel) == false); |
573 | 573 | WARN_ON(dispc_mgr_go_busy(channel)); | |
574 | /* if the channel is not enabled, we don't need GO */ | ||
575 | enable_bit = mgr_fld_read(channel, DISPC_MGR_FLD_ENABLE) == 1; | ||
576 | |||
577 | if (!enable_bit) | ||
578 | return; | ||
579 | |||
580 | go_bit = mgr_fld_read(channel, DISPC_MGR_FLD_GO) == 1; | ||
581 | |||
582 | if (go_bit) { | ||
583 | DSSERR("GO bit not down for channel %d\n", channel); | ||
584 | return; | ||
585 | } | ||
586 | 574 | ||
587 | DSSDBG("GO %s\n", mgr_desc[channel].name); | 575 | DSSDBG("GO %s\n", mgr_desc[channel].name); |
588 | 576 | ||