diff --git a/[refs] b/[refs]
index 9863517abddb..543ea9e13352 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d00aa6695b67a31be2ce5f7464da32c20cb50699
+refs/heads/master: 85dfd81dc57e8183a277ddd7a56aa65c96f3f487
diff --git a/trunk/drivers/char/pty.c b/trunk/drivers/char/pty.c
index 6e6942c45f5b..d083c73d784a 100644
--- a/trunk/drivers/char/pty.c
+++ b/trunk/drivers/char/pty.c
@@ -144,6 +144,8 @@ static int pty_write(struct tty_struct *tty, const unsigned char *buf,
 
 static int pty_write_room(struct tty_struct *tty)
 {
+	if (tty->stopped)
+		return 0;
 	return pty_space(tty->link);
 }