From d25ded8d3c6ecc3043763d4330c964603dc61bd4 Mon Sep 17 00:00:00 2001 From: Finn Thain Date: Fri, 3 Jul 2015 13:35:36 +1000 Subject: char/nvram: Use bitwise OR to obtain Atari video mode data Signed-off-by: Finn Thain Acked-by: Geert Uytterhoeven Signed-off-by: Greg Kroah-Hartman --- drivers/char/nvram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/char/nvram.c') diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c index 9df78e2cc45d..97c2d8d433d6 100644 --- a/drivers/char/nvram.c +++ b/drivers/char/nvram.c @@ -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], -- cgit