Commit 08650869 authored by David Winn's avatar David Winn Committed by Linus Torvalds

fbcon: fix monochrome color value calculation

Commit 22af89aa ("fbcon: replace mono_col
macro with static inline") changed the order of operations for computing
monochrome color values.  This generates 0xffff000f instead of 0x0000000f
for a 4 bit monochrome color, leading to image corruption if it is passed
to cfb_imageblit or other similar functions.  Fix it up.

Cc: Harvey Harrison <harvey.harrison@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Cc: <stable@kernel.org>		[2.6.26.x]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 550ac958
...@@ -110,7 +110,7 @@ static inline int mono_col(const struct fb_info *info) ...@@ -110,7 +110,7 @@ static inline int mono_col(const struct fb_info *info)
__u32 max_len; __u32 max_len;
max_len = max(info->var.green.length, info->var.red.length); max_len = max(info->var.green.length, info->var.red.length);
max_len = max(info->var.blue.length, max_len); max_len = max(info->var.blue.length, max_len);
return ~(0xfff << (max_len & 0xff)); return (~(0xfff << max_len)) & 0xff;
} }
static inline int attr_col_ec(int shift, struct vc_data *vc, static inline int attr_col_ec(int shift, struct vc_data *vc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment