---

yaml --- r: 82999 b: refs/heads/master c: c3e4642 h: refs/heads/master i: 82997: fd98870 82995: 4057954 82991: 3823262 v: v3
git-mirror · Feb 5, 2008 · dee91a5 · dee91a5
1 parent 0018027
commit dee91a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 
 		/*