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>

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
index 7f38eeaafac3..2aea2f91e271 100644
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c
@@ -199,9 +199,14 @@ EXPORT_SYMBOL(tty_port_tty_set);
 static void tty_port_shutdown(struct tty_port *port)
 {
         mutex_lock(&port->mutex);
-        if (port->ops->shutdown && !port->console &&
-                test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags))
+        if (port->console)
+                goto out;
+
+        if (test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags)) {
+                if (port->ops->shutdown)
                         port->ops->shutdown(port);
+        }
+out:
         mutex_unlock(&port->mutex);
 }