Re: [PATCH] char/nvram: Use bitwise OR to obtain Atari video mode data

[Geert Uytterhoeven]

On Fri, Jul 3, 2015 at 5:35 AM, Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx> wrote:
> Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>

Nice catch!

Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

> 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@xxxxxxxxxxxxxx

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/