From a0e1947a33a0d4eec7e7cbb86e58a2ebd0de7d9e Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Mon, 12 Jun 2006 12:16:26 +1000
Subject: [PATCH] --- yaml --- r: 27189 b: refs/heads/master c:
 289a1e995e74734b5ec76ca8a5490058f4fecc24 h: refs/heads/master i:   27187:
 44b4848f3679a9f69bfe63c1229fafff4268c357 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/char/n_tty.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ef0e411ec2b4..1ddf7a4d1b3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc4967e756021f318d125c9f4fa98b958ae9f2de
+refs/heads/master: 289a1e995e74734b5ec76ca8a5490058f4fecc24
diff --git a/trunk/drivers/char/n_tty.c b/trunk/drivers/char/n_tty.c
index ede365d05387..b9371d5bf790 100644
--- a/trunk/drivers/char/n_tty.c
+++ b/trunk/drivers/char/n_tty.c
@@ -1384,8 +1384,10 @@ static ssize_t read_chan(struct tty_struct *tty, struct file *file,
 		 * longer than TTY_THRESHOLD_UNTHROTTLE in canonical mode,
 		 * we won't get any more characters.
 		 */
-		if (n_tty_chars_in_buffer(tty) <= TTY_THRESHOLD_UNTHROTTLE)
+		if (n_tty_chars_in_buffer(tty) <= TTY_THRESHOLD_UNTHROTTLE) {
+			n_tty_set_room(tty);
 			check_unthrottle(tty);
+		}
 
 		if (b - buf >= minimum)
 			break;