diff --git a/[refs] b/[refs]
index 5176ce81f9cf..8d60ffcb705a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 421b40a6286ee343d77d5e51f5ee6d04d7a2a90f
+refs/heads/master: dab73b4eb9ef924a2b90dab84e539076d82b256f
diff --git a/trunk/drivers/tty/n_tty.c b/trunk/drivers/tty/n_tty.c
index d655416087b7..6c7fe90ad72d 100644
--- a/trunk/drivers/tty/n_tty.c
+++ b/trunk/drivers/tty/n_tty.c
@@ -1573,6 +1573,14 @@ static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
 			ldata->real_raw = 0;
 	}
 	n_tty_set_room(tty);
+	/*
+	 * Fix tty hang when I_IXON(tty) is cleared, but the tty
+	 * been stopped by STOP_CHAR(tty) before it.
+	 */
+	if (!I_IXON(tty) && old && (old->c_iflag & IXON) && !tty->flow_stopped) {
+		start_tty(tty);
+	}
+
 	/* The termios change make the tty ready for I/O */
 	wake_up_interruptible(&tty->write_wait);
 	wake_up_interruptible(&tty->read_wait);