From: Archit Taneja Date: Mon, 8 Nov 2010 11:56:21 +0000 (+0100) Subject: OMAP: DSS2: Fix: Read correct bit in dispc_enable_alpha_blending() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=712247a6811530acdd604fa21574ccf1f2d80838;p=deliverable%2Flinux.git 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 Signed-off-by: Tomi Valkeinen --- 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; - }