From fee793280abdb6060cc34301082e5dcb3577ee91 Mon Sep 17 00:00:00 2001 From: Doug Anderson Date: Wed, 19 Oct 2011 11:52:01 -0700 Subject: [PATCH] --- yaml --- r: 267364 b: refs/heads/master c: d208a3bf77f902283894f546b6b5383202cf7882 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/serial_core.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fe1187390c83..9d44e469cc3c 100644 --- 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 index e562b1224466..9f72be28e6f2 100644 --- 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. */