From 7c0ca473a52c1daf1153bd15fb18e875ef3170c8 Mon Sep 17 00:00:00 2001
From: Andrew McGregor <andrew.mcgregor@alliedtelesis.co.nz>
Date: Mon, 13 Jun 2011 11:31:31 +1200
Subject: [PATCH] --- yaml --- r: 259335 b: refs/heads/master c:
 7b292b4bf9a9d6098440d85616d6ca4c608b8304 h: refs/heads/master i:   259333:
 72aba64826d17d64dbb676d9ee3383a340faf870   259331:
 2b70f8665501b85ea0a79780c9f278ddbc7e0b90   259327:
 b163d0e2bd0d3e5c8f7674b5b77524ec00828895 v: v3

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

diff --git a/[refs] b/[refs]
index 388d6edc092f..064cdeb0dcb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8168e9c2de7383c497aff9cd906dd475f9b42b2c
+refs/heads/master: 7b292b4bf9a9d6098440d85616d6ca4c608b8304
diff --git a/trunk/drivers/tty/n_tty.c b/trunk/drivers/tty/n_tty.c
index 0ad32888091c..1ddc5d7c9592 100644
--- a/trunk/drivers/tty/n_tty.c
+++ b/trunk/drivers/tty/n_tty.c
@@ -185,7 +185,6 @@ static void reset_buffer_flags(struct tty_struct *tty)
 	tty->canon_head = tty->canon_data = tty->erasing = 0;
 	memset(&tty->read_flags, 0, sizeof tty->read_flags);
 	n_tty_set_room(tty);
-	check_unthrottle(tty);
 }
 
 /**
@@ -1587,6 +1586,7 @@ static int n_tty_open(struct tty_struct *tty)
 			return -ENOMEM;
 	}
 	reset_buffer_flags(tty);
+	tty_unthrottle(tty);
 	tty->column = 0;
 	n_tty_set_termios(tty, NULL);
 	tty->minimum_to_wake = 1;