From dee91a545f45df2951c9de3ff8cbc40c339076ec Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Mon, 4 Feb 2008 22:27:46 -0800 Subject: [PATCH] --- yaml --- r: 82999 b: refs/heads/master c: c3e4642be734ce3d2c7398246d8cbced3a039f54 h: refs/heads/master i: 82997: fd98870e6ccef85edc922df7690d0e815b0dc288 82995: 405795425f29ffe9b11630f9203a0dfd9ade7c93 82991: 38232629e6c4627280e504f3cae32da35ecdd7d2 v: v3 --- [refs] | 2 +- trunk/drivers/serial/serial_core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1cd1111ac0f1..6ef3a88f1703 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1523508d6321436b6edfcd99aab04a344f9aed3f +refs/heads/master: c3e4642be734ce3d2c7398246d8cbced3a039f54 diff --git a/trunk/drivers/serial/serial_core.c b/trunk/drivers/serial/serial_core.c index 3bb5d241dd40..0cf382b55d4b 100644 --- a/trunk/drivers/serial/serial_core.c +++ b/trunk/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); /*