diff options
author | Archit Taneja <archit@ti.com> | 2010-11-08 06:56:21 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2011-01-10 03:54:18 -0500 |
commit | 712247a6811530acdd604fa21574ccf1f2d80838 (patch) | |
tree | ede38ff73b6e2dd2a67d945d4595ed3da52d7ecc /drivers/video | |
parent | 01539ba2a706ab7d35fc0667dff919ade7f87d63 (diff) |
OMAP: DSS2: Fix: Read correct bit in dispc_enable_alpha_blending()
Read correct DISPC_CONFIG bit when the channel is DIGIT, remove extra line
at the end of the function.
Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/omap2/dss/dispc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index fa40fa59a9ac..4e04a73a8ff3 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c | |||
@@ -2003,13 +2003,12 @@ bool dispc_alpha_blending_enabled(enum omap_channel ch) | |||
2003 | if (ch == OMAP_DSS_CHANNEL_LCD) | 2003 | if (ch == OMAP_DSS_CHANNEL_LCD) |
2004 | enabled = REG_GET(DISPC_CONFIG, 18, 18); | 2004 | enabled = REG_GET(DISPC_CONFIG, 18, 18); |
2005 | else if (ch == OMAP_DSS_CHANNEL_DIGIT) | 2005 | else if (ch == OMAP_DSS_CHANNEL_DIGIT) |
2006 | enabled = REG_GET(DISPC_CONFIG, 18, 18); | 2006 | enabled = REG_GET(DISPC_CONFIG, 19, 19); |
2007 | else | 2007 | else |
2008 | BUG(); | 2008 | BUG(); |
2009 | enable_clocks(0); | 2009 | enable_clocks(0); |
2010 | 2010 | ||
2011 | return enabled; | 2011 | return enabled; |
2012 | |||
2013 | } | 2012 | } |
2014 | 2013 | ||
2015 | 2014 | ||