summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2015-07-03 13:35:36 +1000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-05 13:30:16 -0700
commitd25ded8d3c6ecc3043763d4330c964603dc61bd4 (patch)
tree91673547b2a3ed0ddd0b075e8aa61ef6aa99be0d /drivers
parentff63ec1312dabd28876c9c03b5ed172a879bfb60 (diff)
downloadlinux-d25ded8d3c6ecc3043763d4330c964603dc61bd4.tar.gz
linux-d25ded8d3c6ecc3043763d4330c964603dc61bd4.tar.bz2
linux-d25ded8d3c6ecc3043763d4330c964603dc61bd4.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/nvram.c2
1 files changed, 1 insertions, 1 deletions
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],