The patch titled
serial: fix serial_txx9 console initialization
has been added to the -mm tree. Its filename is
serial-fix-serial_txx9-console-initialization.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: serial: fix serial_txx9 console initialization
From: Atsushi Nemoto <anemo@xxxxxxxxxxxxx>
Since commit 97d97224ff361e08777fb33e0fd193ca877dac28, 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@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/serial/serial_txx9.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff -puN drivers/serial/serial_txx9.c~serial-fix-serial_txx9-console-initialization drivers/serial/serial_txx9.c
--- a/drivers/serial/serial_txx9.c~serial-fix-serial_txx9-console-initialization
+++ a/drivers/serial/serial_txx9.c
@@ -657,7 +657,15 @@ static void
serial_txx9_pm(struct uart_port *port, unsigned int state,
unsigned int oldstate)
{
- if (state == 0)
+ /*
+ * If oldstate was -1 this is called from
+ * uart_configure_port(). In this case do not initialize the
+ * port now, because the port was already initialized (for
+ * non-console port) or should not be initialized here (for
+ * console port). If we initialized the port here we lose
+ * serial console settings.
+ */
+ if (state == 0 && oldstate != -1)
serial_txx9_initialize(port);
}
_
Patches currently in -mm which might be from anemo@xxxxxxxxxxxxx are
serial-fix-serial_txx9-console-initialization.patch
clocksource-make-clocksource_mask-bullet-proof.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
