diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 07:00:20 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 07:00:20 +0200 |
commit | 4b61bb575b1fb42ab1df228ae7812e5135f656da (patch) | |
tree | 03456466e6f678456ea462a7da4b352d1aa03aa3 /drivers/char/n_tty.c | |
parent | Input: xpad - add USB ID for the drumkit controller from Rock Band (diff) | |
parent | Linux 2.6.31-rc8 (diff) | |
download | linux-4b61bb575b1fb42ab1df228ae7812e5135f656da.tar.xz linux-4b61bb575b1fb42ab1df228ae7812e5135f656da.zip |
Merge commit 'v2.6.31-rc8' into next
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 ff47907ff1bf..973be2f44195 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; |