* [PATCH] char/nvram: Use bitwise OR to obtain Atari video mode data
@ 2015-07-03 3:35 Finn Thain
2015-07-03 6:52 ` Geert Uytterhoeven
0 siblings, 1 reply; 2+ messages in thread
From: Finn Thain @ 2015-07-03 3:35 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linux-m68k
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
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],
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] char/nvram: Use bitwise OR to obtain Atari video mode data
2015-07-03 3:35 [PATCH] char/nvram: Use bitwise OR to obtain Atari video mode data Finn Thain
@ 2015-07-03 6:52 ` Geert Uytterhoeven
0 siblings, 0 replies; 2+ messages in thread
From: Geert Uytterhoeven @ 2015-07-03 6:52 UTC (permalink / raw)
To: Finn Thain; +Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Linux/m68k
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-07-03 6:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-03 3:35 [PATCH] char/nvram: Use bitwise OR to obtain Atari video mode data Finn Thain
2015-07-03 6:52 ` Geert Uytterhoeven
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®