1 files changed, 8 insertions, 10 deletions

diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index 67e9afa000c1..4dd5c3f98167 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -294,7 +294,7 @@ static _INLINE_ void receive_chars(struct m68k_serial *info, struct pt_regs *reg
 {
         struct tty_struct *tty = info->tty;
         m68328_uart *uart = &uart_addr[info->line];
-        unsigned char ch;
+        unsigned char ch, flag;
 
         /*
          * This do { } while() loop will get ALL chars out of Rx FIFO 
@@ -332,26 +332,24 @@ static _INLINE_ void receive_chars(struct m68k_serial *info, struct pt_regs *reg
                 /*
                  * Make sure that we do not overflow the buffer
                  */
-                if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+                if (tty_request_buffer_room(tty, 1) == 0) {
                         schedule_work(&tty->flip.work);
                         return;
                 }
 
+                flag = TTY_NORMAL;
+
                 if(rx & URX_PARITY_ERROR) {
-                        *tty->flip.flag_buf_ptr++ = TTY_PARITY;
+                        flag = TTY_PARITY;
                         status_handle(info, rx);
                 } else if(rx & URX_OVRUN) {
-                        *tty->flip.flag_buf_ptr++ = TTY_OVERRUN;
+                        flag = TTY_OVERRUN;
                         status_handle(info, rx);
                 } else if(rx & URX_FRAME_ERROR) {
-                        *tty->flip.flag_buf_ptr++ = TTY_FRAME;
+                        flag = TTY_FRAME;
                         status_handle(info, rx);
-                } else {
-                        *tty->flip.flag_buf_ptr++ = 0; /* XXX */
                 }
-                *tty->flip.char_buf_ptr++ = ch;
-                tty->flip.count++;
-
+                tty_insert_flip_char(tty, ch, flag);
 #ifndef CONFIG_XCOPILOT_BUGS
         } while((rx = uart->urx.w) & URX_DATA_READY);
 #endif