These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / char / nvram.c

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