diff --git a/[refs] b/[refs]
index 465f6f608930..cbd9e37d04c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d2ead743dd54dff1fe3d0f4933e5da8bfe07472
+refs/heads/master: 52856ed732aeab5e8e0b7c9e2a7a3d31736218ab
diff --git a/trunk/drivers/char/tty_ldisc.c b/trunk/drivers/char/tty_ldisc.c
index 94b3e06d73ec..874c2486c034 100644
--- a/trunk/drivers/char/tty_ldisc.c
+++ b/trunk/drivers/char/tty_ldisc.c
@@ -793,6 +793,8 @@ void tty_ldisc_hangup(struct tty_struct *tty)
 		/* Avoid racing set_ldisc */
 		mutex_lock(&tty->ldisc_mutex);
 		/* Switch back to N_TTY */
+		tty_ldisc_halt(tty);
+		tty_ldisc_wait_idle(tty);
 		tty_ldisc_reinit(tty);
 		/* At this point we have a closed ldisc and we want to
 		   reopen it. We could defer this to the next open but