[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20071019.011355.39154656.anemo@mba.ocn.ne.jp>
Date: Fri, 19 Oct 2007 01:13:55 +0900 (JST)
From: Atsushi Nemoto <anemo@....ocn.ne.jp>
To: rmk+kernel@....linux.org.uk
Cc: linux-kernel@...r.kernel.org, linux-serial@...r.kernel.org,
akpm@...ux-foundation.org
Subject: [PATCH] serial: do not call ->pm() on initialization for console
port
This commit in current git tree broke serial console for serial_txx9 driver.
> commit 97d97224ff361e08777fb33e0fd193ca877dac28
> Author: Russell King <rmk@...-67.arm.linux.org.uk>
> Date: Sat Sep 1 21:25:09 2007 +0100
>
> [SERIAL] Fix console initialisation ordering
The serial_txx9 driver initialize its port entirely on its ->pm()
method if new state was 0. With the commit, serial_core calls ->pm()
even if the port was used for console.
Attached patch fixes this problem. Is this a right way?
If not, I will fix the serial_txx9 driver to skip the initialization in
->pm() if oldstate was -1.
------------------------------------------------------
Subject: serial: do not call ->pm() on initialization for console port
From: Atsushi Nemoto <anemo@....ocn.ne.jp>
If the port was already enabled as a serial console, there is no need
to call pm callback to power it up. This patch fixes serial console
initialization on serial_txx9 driver.
Signed-off-by: Atsushi Nemoto <anemo@....ocn.ne.jp>
---
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 68aa4da..5a38076 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -2326,7 +2326,6 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
}
state->port = port;
- state->pm_state = -1;
port->cons = drv->cons;
port->info = state->info;
@@ -2336,6 +2335,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
* initialised.
*/
if (!(uart_console(port) && (port->cons->flags & CON_ENABLED))) {
+ state->pm_state = -1;
spin_lock_init(&port->lock);
lockdep_set_class(&port->lock, &port_lock_key);
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists