projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
01539ba
)
OMAP: DSS2: Fix: Read correct bit in dispc_enable_alpha_blending()
author
Archit Taneja
<archit@ti.com>
Mon, 8 Nov 2010 11:56:21 +0000
(12:56 +0100)
committer
Tomi Valkeinen
<tomi.valkeinen@nokia.com>
Mon, 10 Jan 2011 08:54:18 +0000
(10:54 +0200)
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>
drivers/video/omap2/dss/dispc.c
patch
|
blob
|
history
diff --git
a/drivers/video/omap2/dss/dispc.c
b/drivers/video/omap2/dss/dispc.c
index fa40fa59a9acf9c89b2b4b562472871dfd0a1a2f..4e04a73a8ff38ad07a5111668fc47377253fd010 100644
(file)
--- 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, 1
8, 18
);
+ enabled = REG_GET(DISPC_CONFIG, 1
9, 19
);
else
BUG();
enable_clocks(0);
return enabled;
-
}