From f7dde2fda1d33d5e8dc162fe9b6eb1396f0de566 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Thu, 7 Mar 2013 15:55:48 +0100
Subject: [PATCH] --- yaml --- r: 364239 b: refs/heads/master c:
 8bde9658a0e6a7098dcda1ce6ea6b278029644b4 h: refs/heads/master i:   364237:
 79c8f103d4aff25967e4923951953e9ae5963530   364235:
 dbc6f12103a2f3bad81a2a7714039eddc63a64ca   364231:
 de04956ad4f69bb6a27e8b60bf35c2c29376dd2e   364223:
 8b447920d897b3572d21776d7bdedf08e2ec9f76 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/tty/tty_port.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e94384d4a809..6137b445d762 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b12d8dc2dbe2d2d1d6eec314d586b1eed75756dc
+refs/heads/master: 8bde9658a0e6a7098dcda1ce6ea6b278029644b4
diff --git a/trunk/drivers/tty/tty_port.c b/trunk/drivers/tty/tty_port.c
index 7f38eeaafac3..2aea2f91e271 100644
--- a/trunk/drivers/tty/tty_port.c
+++ b/trunk/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);
 }