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

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 9df78e2cc45d2951fc77815975cbeeb6633aea3a..97c2d8d433d6227f82f8524da27ecbd8929d9cd8 100644 (file)
--- 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],