summaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2017-02-06 15:38:03 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-10 15:32:53 +0100
commit84a1ed0407d209beff4d9cb41120d0f69a89d4b8 (patch)
treeaeae72a0da7d3293bd795171287ced147d8247a9 /drivers/misc
parent90beaf64226742733c1b38d086f9e5dcd3b7b0e5 (diff)
misc: panel: Fix LCD_FLAG_F/LCD_FLAG_N exchange
LCD_FLAG_F is the font flag, LCD_FLAG_N is the two-lines flag. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/panel.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/misc/panel.c b/drivers/misc/panel.c
index 6030ac5b8c63..cac7ac62ce5b 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)) {