Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

serial: fix serial_txx9 console initialization

Since commit 97d97224ff361e08777fb33e0fd193ca877dac28 ("[SERIAL] Fix
console initialisation ordering"), serial_core calls ->pm() on
initialization even if the port was used for console.

This behaviour breaks serial_txx9 console since The serial_txx9 driver
initialize its port entirely on its ->pm() method if new state was 0.
This patch adds checking for oldstate value to fix this probelm.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Atsushi Nemoto and committed by
Linus Torvalds
23f42b7b 10e27ed4

+9 -1
+9 -1
drivers/serial/serial_txx9.c
··· 657 657 serial_txx9_pm(struct uart_port *port, unsigned int state, 658 658 unsigned int oldstate) 659 659 { 660 - if (state == 0) 660 + /* 661 + * If oldstate was -1 this is called from 662 + * uart_configure_port(). In this case do not initialize the 663 + * port now, because the port was already initialized (for 664 + * non-console port) or should not be initialized here (for 665 + * console port). If we initialized the port here we lose 666 + * serial console settings. 667 + */ 668 + if (state == 0 && oldstate != -1) 661 669 serial_txx9_initialize(port); 662 670 } 663 671