diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2015-07-03 05:35:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-05 22:30:16 +0200 |
| commit | d25ded8d3c6ecc3043763d4330c964603dc61bd4 (patch) | |
| tree | 91673547b2a3ed0ddd0b075e8aa61ef6aa99be0d /drivers/char | |
| parent | coresight: Fix implicit inclusion of linux/sched.h (diff) | |
| download | linux-d25ded8d3c6ecc3043763d4330c964603dc61bd4.tar.xz 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/char')
| -rw-r--r-- | drivers/char/nvram.c | 2 |
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], |