lkml.org 
[lkml]   [2015]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] char/nvram: Use bitwise OR to obtain Atari video mode data
From
On Fri, Jul 3, 2015 at 5:35 AM, Finn Thain <fthain@telegraphics.com.au> wrote:
> Signed-off-by: Finn Thain <fthain@telegraphics.com.au>

Nice catch!

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

> Index: linux/drivers/char/nvram.c
> ===================================================================
> --- linux.orig/drivers/char/nvram.c 2015-07-02 13:50:40.000000000 +1000
> +++ linux/drivers/char/nvram.c 2015-07-02 14:00:05.000000000 +1000
> @@ -702,7 +702,7 @@ static void atari_proc_infos(unsigned ch
> 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],

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds


\
 
 \ /
  Last update: 2015-07-03 09:01    [W:0.034 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site