Skip to content

Commit

Permalink
OMAP: DSS2: Fix: Read correct bit in dispc_enable_alpha_blending()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Archit Taneja authored and Tomi Valkeinen committed Jan 10, 2011
1 parent 01539ba commit 712247a
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/video/omap2/dss/dispc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

}


Expand Down

0 comments on commit 712247a

Please sign in to comment.