diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 19:38:04 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 19:38:04 +0200 |
commit | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (patch) | |
tree | 8492ea548fea2d8243e4af4b877906afc4e32783 /drivers/char/n_tty.c | |
parent | b4093d6235b7e4249616651ee328600ced48a18a (diff) | |
parent | 658874f05d040ca96eb5ba9b1c30ce0ff287d762 (diff) | |
download | op-kernel-dev-2e6713c7662cc5ebc7346b033c404cb2f708fd51.zip op-kernel-dev-2e6713c7662cc5ebc7346b033c404cb2f708fd51.tar.gz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/char/n_tty.c')
-rw-r--r-- | drivers/char/n_tty.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c index ff47907..973be2f 100644 --- a/drivers/char/n_tty.c +++ b/drivers/char/n_tty.c @@ -1583,6 +1583,7 @@ static int n_tty_open(struct tty_struct *tty) static inline int input_available_p(struct tty_struct *tty, int amt) { + tty_flush_to_ldisc(tty); if (tty->icanon) { if (tty->canon_data) return 1; |