Commit d25ded8d authored by Finn Thain's avatar Finn Thain Committed by Greg Kroah-Hartman
Browse files

char/nvram: Use bitwise OR to obtain Atari video mode data 



Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ff63ec13

drivers/char/nvram.c

+1 −1
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ static void atari_proc_infos(unsigned char *nvram, struct seq_file *seq, 
		seq_printf(seq, "%ds%s\n", nvram[10],

		    nvram[10] < 8 ? ", no memory test" : "");



	vmode = (nvram[14] << 8) || nvram[15];

	vmode = (nvram[14] << 8) | nvram[15];

	seq_printf(seq,

	    "Video mode       : %s colors, %d columns, %s %s monitor\n",

	    colors[vmode & 7],