aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2010-11-08 12:56:21 +0100
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2011-01-10 10:54:18 +0200
commit712247a6811530acdd604fa21574ccf1f2d80838 (patch)
treeede38ff73b6e2dd2a67d945d4595ed3da52d7ecc /drivers/video/omap2
parent01539ba2a706ab7d35fc0667dff919ade7f87d63 (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/omap2')
-rw-r--r--drivers/video/omap2/dss/dispc.c3
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)
if (ch == OMAP_DSS_CHANNEL_LCD)
enabled = REG_GET(DISPC_CONFIG, 18, 18);
else if (ch == OMAP_DSS_CHANNEL_DIGIT)
- enabled = REG_GET(DISPC_CONFIG, 18, 18);
+ enabled = REG_GET(DISPC_CONFIG, 19, 19);
else
BUG();
enable_clocks(0);
return enabled;
-
}

Privacy Policy