From edb780f67ccd9e1f9ef53d14666090fac6f6878d Mon Sep 17 00:00:00 2001 From: David Winn Date: Thu, 2 Oct 2008 14:50:11 -0700 Subject: [PATCH] --- yaml --- r: 110129 b: refs/heads/master c: 08650869e0ec581f8d88cfdb563d37f5383abfe2 h: refs/heads/master i: 110127: f50a8d008f25a43db853d4cf594343ca41bafdab v: v3 --- [refs] | 2 +- trunk/drivers/video/console/fbcon.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 59b0be2bcb79..72ae8c3b8900 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 550ac958791399266c20e15e8048cd12bfce08ae +refs/heads/master: 08650869e0ec581f8d88cfdb563d37f5383abfe2 diff --git a/trunk/drivers/video/console/fbcon.h b/trunk/drivers/video/console/fbcon.h index a6e38e9ea73f..89a346880ec0 100644 --- a/trunk/drivers/video/console/fbcon.h +++ b/trunk/drivers/video/console/fbcon.h @@ -110,7 +110,7 @@ static inline int mono_col(const struct fb_info *info) __u32 max_len; max_len = max(info->var.green.length, info->var.red.length); 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,