From d2e72156e204bcb6fd22c16868a04d58d40b39fc Mon Sep 17 00:00:00 2001 From: Vitaly Bordug Date: Wed, 8 Feb 2006 21:40:13 +0000 Subject: [PATCH] --- yaml --- r: 20142 b: refs/heads/master c: 76a55431cc7237f018c7c667860d60e2b6427bf1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/cpm_uart/cpm_uart_core.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index f933a6e35b3e..62a71f6aeff3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: deb37bb7a94c052140d1461a09b877a00e7e2476 +refs/heads/master: 76a55431cc7237f018c7c667860d60e2b6427bf1 diff --git a/trunk/drivers/serial/cpm_uart/cpm_uart_core.c b/trunk/drivers/serial/cpm_uart/cpm_uart_core.c index 3d80846e384a..b7bf4c698a47 100644 --- a/trunk/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/trunk/drivers/serial/cpm_uart/cpm_uart_core.c @@ -252,12 +252,9 @@ static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs) /* If we have not enough room in tty flip buffer, then we try * later, which will be the next rx-interrupt or a timeout */ - if ((tty->flip.count + i) >= TTY_FLIPBUF_SIZE) { - tty->flip.work.func((void *)tty); - if ((tty->flip.count + i) >= TTY_FLIPBUF_SIZE) { - printk(KERN_WARNING "TTY_DONT_FLIP set\n"); - return; - } + if(tty_buffer_request_room(tty, i) < i) { + printk(KERN_WARNING "No room in flip buffer\n"); + return; } /* get pointer */ @@ -276,9 +273,7 @@ static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs) continue; error_return: - *tty->flip.char_buf_ptr++ = ch; - *tty->flip.flag_buf_ptr++ = flg; - tty->flip.count++; + tty_insert_flip_char(tty, ch, flg); } /* End while (i--) */