TTY: clean up port shutdown

Untangle port-shutdown logic and make sure the initialised flag is
always cleared for non-console ports.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2013-03-07 15:55:48 +01:00 committed by Greg Kroah-Hartman
parent b12d8dc2db
commit 8bde9658a0
1 changed files with 7 additions and 2 deletions

View File

@ -199,9 +199,14 @@ EXPORT_SYMBOL(tty_port_tty_set);
static void tty_port_shutdown(struct tty_port *port) static void tty_port_shutdown(struct tty_port *port)
{ {
mutex_lock(&port->mutex); mutex_lock(&port->mutex);
if (port->ops->shutdown && !port->console && if (port->console)
test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags)) goto out;
if (test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags)) {
if (port->ops->shutdown)
port->ops->shutdown(port); port->ops->shutdown(port);
}
out:
mutex_unlock(&port->mutex); mutex_unlock(&port->mutex);
} }