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);
 }