Commit:     c3e4642be734ce3d2c7398246d8cbced3a039f54
Parent:     1523508d6321436b6edfcd99aab04a344f9aed3f
Author:     Yinghai Lu <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 4 22:27:46 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Feb 5 09:44:09 2008 -0800

    serial: keep the DTR setting for serial console.
    with reverting "x86, serial: convert legacy COM ports to platform devices",
    we will have the serial console before the port is probled again.
    uart_add_one_port==>uart_configure_port==>set_mcttrl(port, 0) will clear
    the DTR setting by uart_set_options().  then I will lose my output from
    serial console again.
    So try to keep DTR in uart_configure_port()
    Signed-off-by: Yinghai Lu <[EMAIL PROTECTED]>
    Cc: Russell King <[EMAIL PROTECTED]>
    Cc: Alan Cox <[EMAIL PROTECTED]>
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Cc: Bjorn Helgaas <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/serial/serial_core.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 3bb5d24..0cf382b 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -2150,10 +2150,11 @@ uart_configure_port(struct uart_driver *drv, struct 
uart_state *state,
                 * Ensure that the modem control lines are de-activated.
+                * keep the DTR setting that is set in uart_set_options()
                 * We probably don't need a spinlock around this, but
                spin_lock_irqsave(&port->lock, flags);
-               port->ops->set_mctrl(port, 0);
+               port->ops->set_mctrl(port, port->mctrl & TIOCM_DTR);
                spin_unlock_irqrestore(&port->lock, flags);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to