diff -Nurp a/drivers/char/n_tty.c b/drivers/char/n_tty.c
--- a/drivers/char/n_tty.c	2009-08-11 11:28:46.352996327 -0600
+++ b/drivers/char/n_tty.c	2009-08-11 11:30:05.152996397 -0600
@@ -366,6 +366,9 @@ static int process_output(unsigned char 
 {
 	int	space, retval;
 
+	if (tty->stopped)
+		return -1;
+
 	mutex_lock(&tty->output_lock);
 
 	space = tty_write_room(tty);
@@ -404,6 +407,9 @@ static ssize_t process_output_block(stru
 	int 	i;
 	const unsigned char *cp;
 
+	if (tty->stopped)
+		return 0;
+
 	mutex_lock(&tty->output_lock);
 
 	space = tty_write_room(tty);
@@ -487,7 +493,7 @@ static void process_echoes(struct tty_st
 	unsigned char c;
 	unsigned char *cp, *buf_end;
 
-	if (!tty->echo_cnt)
+	if (!tty->echo_cnt || tty->stopped)
 		return;
 
 	mutex_lock(&tty->output_lock);
@@ -1965,7 +1971,11 @@ static ssize_t n_tty_write(struct tty_st
 				tty->ops->flush_chars(tty);
 		} else {
 			while (nr > 0) {
+				if (tty->stopped)
+					break;
+				mutex_lock(&tty->output_lock);
 				c = tty->ops->write(tty, b, nr);
+				mutex_unlock(&tty->output_lock);
 				if (c < 0) {
 					retval = c;
 					goto break_out;
diff -Nurp a/drivers/char/pty.c b/drivers/char/pty.c
--- a/drivers/char/pty.c	2009-08-11 11:33:03.603031387 -0600
+++ b/drivers/char/pty.c	2009-08-11 11:33:15.702997374 -0600
@@ -115,9 +115,6 @@ static int pty_write(struct tty_struct *
 	struct tty_struct *to = tty->link;
 	int c;
 
-	if (tty->stopped)
-		return 0;
-
 	/* This isn't locked but our 8K is quite sloppy so no
 	   big deal */
 
@@ -144,8 +141,6 @@ static int pty_write(struct tty_struct *
 
 static int pty_write_room(struct tty_struct *tty)
 {
-	if (tty->stopped)
-		return 0;
 	return pty_space(tty->link);
 }
 
diff -Nurp a/drivers/char/tty_io.c b/drivers/char/tty_io.c
--- a/drivers/char/tty_io.c	2009-08-11 11:29:16.312996885 -0600
+++ b/drivers/char/tty_io.c	2009-08-11 11:30:05.242984105 -0600
@@ -1020,8 +1020,11 @@ void tty_write_message(struct tty_struct
 	lock_kernel();
 	if (tty) {
 		mutex_lock(&tty->atomic_write_lock);
-		if (tty->ops->write && !test_bit(TTY_CLOSING, &tty->flags))
+		if (tty->ops->write && !test_bit(TTY_CLOSING, &tty->flags)) {
+			mutex_lock(&tty->output_lock);
 			tty->ops->write(tty, msg, strlen(msg));
+			mutex_unlock(&tty->output_lock);
+		}
 		tty_write_unlock(tty);
 	}
 	unlock_kernel();
diff -Nurp a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
--- a/drivers/char/tty_ioctl.c	2009-08-11 11:29:20.582997095 -0600
+++ b/drivers/char/tty_ioctl.c	2009-08-11 11:30:05.252996746 -0600
@@ -893,7 +893,9 @@ static int send_prio_char(struct tty_str
 
 	if (was_stopped)
 		start_tty(tty);
+	mutex_lock(&tty->output_lock);
 	tty->ops->write(tty, &ch, 1);
+	mutex_unlock(&tty->output_lock);
 	if (was_stopped)
 		stop_tty(tty);
 	tty_write_unlock(tty);
diff -Nurp a/drivers/char/vt.c b/drivers/char/vt.c
--- a/drivers/char/vt.c	2009-08-11 11:29:04.212996397 -0600
+++ b/drivers/char/vt.c	2009-08-11 11:30:05.202991508 -0600
@@ -2149,7 +2149,7 @@ static int do_con_write(struct tty_struc
 
 	param.vc = vc;
 
-	while (!tty->stopped && count) {
+	while (count) {
 		int orig = *buf;
 		c = orig;
 		buf++;
@@ -2673,8 +2673,6 @@ static int con_put_char(struct tty_struc
 
 static int con_write_room(struct tty_struct *tty)
 {
-	if (tty->stopped)
-		return 0;
 	return 32768;		/* No limit, really; we're not buffering */
 }