From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755068AbbGYH4v (ORCPT ); Sat, 25 Jul 2015 03:56:51 -0400 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:42363 "EHLO kvm5.telegraphics.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754877AbbGYH4s (ORCPT ); Sat, 25 Jul 2015 03:56:48 -0400 Message-Id: <20150725074600.033410118@telegraphics.com.au> User-Agent: quilt/0.50-1 Date: Sat, 25 Jul 2015 17:46:01 +1000 From: Finn Thain To: , , , Arnd Bergmann , Greg Kroah-Hartman Cc: Geert Uytterhoeven Subject: [RFC v5 02/26] char/nvram: Use bitwise OR to obtain Atari video mode data References: <20150725074559.543547894@telegraphics.com.au> Content-Disposition: inline; filename=atari-proc-driver-nvram Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Finn Thain Acked-by: Geert Uytterhoeven Tested-by: Christian T. Steigies --- drivers/char/nvram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux/drivers/char/nvram.c =================================================================== --- linux.orig/drivers/char/nvram.c 2015-07-25 17:42:34.000000000 +1000 +++ linux/drivers/char/nvram.c 2015-07-25 17:45:25.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],