Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

platinumfb: fix misplaced parenthesis

Browse source 
Since `+' has a higher precedence than the trinary operator `?', this
added `hres * (1 << color_mode)' to the boolean testing videomode and
depth.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Roel Kluin 2009-09-22 16:47:04 -07:00 committed by Linus Torvalds
parent d480ace08d
commit 6e3658f0df
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/video/platinumfb.c
View file

@ -223,10 +223,14 @@ static int platinumfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
static inline int platinum_vram_reqd(int video_mode, int color_mode) static inline int platinum_vram_reqd(int video_mode, int color_mode)
{ {
return vmode_attrs[video_mode-1].vres * int baseval = vmode_attrs[video_mode-1].hres * (1<<color_mode);
(vmode_attrs[video_mode-1].hres * (1<<color_mode) +
((video_mode == VMODE_832_624_75) && if ((video_mode == VMODE_832_624_75) && (color_mode > CMODE_8))
(color_mode > CMODE_8)) ? 0x10 : 0x20) + 0x1000; baseval += 0x10;
else
baseval += 0x20;
return vmode_attrs[video_mode-1].vres * baseval + 0x1000;
} }
#define STORE_D2(a, d) { \ #define STORE_D2(a, d) { \