aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/serial/serial_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 3bb5d241dd40..0cf382b55d4b 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,
2150 2150
2151 /* 2151 /*
2152 * Ensure that the modem control lines are de-activated. 2152 * Ensure that the modem control lines are de-activated.
2153 * keep the DTR setting that is set in uart_set_options()
2153 * We probably don't need a spinlock around this, but 2154 * We probably don't need a spinlock around this, but
2154 */ 2155 */
2155 spin_lock_irqsave(&port->lock, flags); 2156 spin_lock_irqsave(&port->lock, flags);
2156 port->ops->set_mctrl(port, 0); 2157 port->ops->set_mctrl(port, port->mctrl & TIOCM_DTR);
2157 spin_unlock_irqrestore(&port->lock, flags); 2158 spin_unlock_irqrestore(&port->lock, flags);
2158 2159
2159 /* 2160 /*