Import 2.1.15

[davej-history.git] / drivers / char / n_tty.c

diff --git a/drivers/char/n_tty.cb/drivers/char/n_tty.c
index 0c0e057..6d6a317 100644 (file)
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -355,7+355,8 @@ static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
                return;
        }
        
-       if (tty->stopped && I_IXON(tty) && I_IXANY(tty)) {
+       if (tty->stopped && !tty->flow_stopped &&
+           I_IXON(tty) && I_IXANY(tty)) {
                start_tty(tty);
                return;
        }