diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 20:55:28 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 20:55:28 +0300 |
| commit | 59af70385fb125f819d953801b6c45629836e916 (patch) | |
| tree | 6232fb052167c7cbd51851323088217617dbde42 /arch/ia64/hp/sim/simserial.c | |
| parent | e7de369050534025b33aab1033358bf47a577e4d (diff) | |
| parent | d50f5c5ca0c3426669fbe11ad4d5708d333eb9fb (diff) | |
| download | linux-59af70385fb125f819d953801b6c45629836e916.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/hp/sim/simserial.c')
| -rw-r--r-- | arch/ia64/hp/sim/simserial.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index a346e1833bf2..27f23fa5ca15 100644 --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c @@ -167,15 +167,9 @@ static void receive_chars(struct tty_struct *tty, struct pt_regs *regs) } } seen_esc = 0; - if (tty->flip.count >= TTY_FLIPBUF_SIZE) break; - *tty->flip.char_buf_ptr = ch; - - *tty->flip.flag_buf_ptr = 0; - - tty->flip.flag_buf_ptr++; - tty->flip.char_buf_ptr++; - tty->flip.count++; + if (tty_insert_flip_char(tty, ch, TTY_NORMAL) == 0) + break; } tty_flip_buffer_push(tty); } |