---

yaml --- r: 267364 b: refs/heads/master c: d208a3b h: refs/heads/master v: v3
git-mirror · Oct 19, 2011 · fee7932 · fee7932
1 parent 185362e
commit fee7932
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32cffe537c7d426cfe33647fed403d409ea3f686
+refs/heads/master: d208a3bf77f902283894f546b6b5383202cf7882
diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c
@@ -243,6 +243,13 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)
 		synchronize_irq(uport->irq);
 	}
 
+	/*
+	 * It's possible for shutdown to be called after suspend if we get
+	 * a DCD drop (hangup) at just the right time.  Clear suspended bit so
+	 * we don't try to resume a port that has been shutdown.
+	 */
+	clear_bit(ASYNCB_SUSPENDED, &port->flags);
+
 	/*
 	 * Free the transmit buffer page.
 	 */