Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e3658f0 authored by Roel Kluin's avatar Roel Kluin Committed by Linus Torvalds
Browse files

platinumfb: fix misplaced parenthesis 



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: default avatarRoel 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d480ace0

drivers/video/platinumfb.c

+8 −4
Original line number Diff line number Diff line
@@ -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)

{

	return vmode_attrs[video_mode-1].vres *

	       (vmode_attrs[video_mode-1].hres * (1<<color_mode) +

		((video_mode == VMODE_832_624_75) &&

		 (color_mode > CMODE_8)) ? 0x10 : 0x20) + 0x1000;

	int baseval = vmode_attrs[video_mode-1].hres * (1<<color_mode);



	if ((video_mode == VMODE_832_624_75) && (color_mode > CMODE_8))

		baseval += 0x10;

	else

		baseval += 0x20;



	return vmode_attrs[video_mode-1].vres * baseval + 0x1000;

}



#define STORE_D2(a, d) { \