diff options
| author | Archit Taneja | 2010-11-08 12:56:21 +0100 |
|---|---|---|
| committer | Tomi Valkeinen | 2011-01-10 09:54:18 +0100 |
| commit | 712247a6811530acdd604fa21574ccf1f2d80838 (patch) | |
| tree | ede38ff73b6e2dd2a67d945d4595ed3da52d7ecc /drivers/video/omap2 | |
| parent | Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | kernel-qcow2-linux-712247a6811530acdd604fa21574ccf1f2d80838.tar.gz kernel-qcow2-linux-712247a6811530acdd604fa21574ccf1f2d80838.tar.xz kernel-qcow2-linux-712247a6811530acdd604fa21574ccf1f2d80838.zip | |
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.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) 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; - } |