From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751891AbdBFOiM (ORCPT ); Mon, 6 Feb 2017 09:38:12 -0500 Received: from andre.telenet-ops.be ([195.130.132.53]:38562 "EHLO andre.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750994AbdBFOiK (ORCPT ); Mon, 6 Feb 2017 09:38:10 -0500 From: Geert Uytterhoeven To: Miguel Ojeda Sandonis , Greg Kroah-Hartman , Willy Tarreau , Ksenija Stanojevic , Arnd Bergmann Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 01/13] misc: panel: Fix LCD_FLAG_F/LCD_FLAG_N exchange Date: Mon, 6 Feb 2017 15:38:03 +0100 Message-Id: <1486391895-9554-2-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1486391895-9554-1-git-send-email-geert@linux-m68k.org> References: <1486391895-9554-1-git-send-email-geert@linux-m68k.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org LCD_FLAG_F is the font flag, LCD_FLAG_N is the two-lines flag. Signed-off-by: Geert Uytterhoeven --- drivers/misc/panel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/misc/panel.c b/drivers/misc/panel.c index 6030ac5b8c639190..cac7ac62ce5b71d7 100644 --- a/drivers/misc/panel.c +++ b/drivers/misc/panel.c @@ -1278,9 +1278,10 @@ static inline int handle_lcd_special_code(void) lcd_write_cmd(LCD_CMD_FUNCTION_SET | LCD_CMD_DATA_LEN_8BITS | ((lcd.flags & LCD_FLAG_F) - ? LCD_CMD_TWO_LINES : 0) - | ((lcd.flags & LCD_FLAG_N) ? LCD_CMD_FONT_5X10_DOTS + : 0) + | ((lcd.flags & LCD_FLAG_N) + ? LCD_CMD_TWO_LINES : 0)); /* check whether L flag was changed */ else if ((oldflags ^ lcd.flags) & (LCD_FLAG_L)) { -- 1.9.1