1 files changed, 10 insertions, 25 deletions

diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index a580748b92a1..f36342ae8e7e 100644
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -422,45 +422,35 @@ cd2401_rxerr_interrupt(int irq, void *dev_id, struct pt_regs *fp)
             base_addr[CyREOIR] = rfoc ? 0 : CyNOTRANS;
             return IRQ_HANDLED;
         }
-        if (tty->flip.count < TTY_FLIPBUF_SIZE){
-            tty->flip.count++;
+        if (tty_buffer_request_room(tty, 1) != 0){
             if (err & info->read_status_mask){
                 if(err & CyBREAK){
-                    *tty->flip.flag_buf_ptr++ = TTY_BREAK;
-                    *tty->flip.char_buf_ptr++ = data;
+                    tty_insert_flip_char(tty, data, TTY_BREAK);
                     if (info->flags & ASYNC_SAK){
                         do_SAK(tty);
                     }
                 }else if(err & CyFRAME){
-                    *tty->flip.flag_buf_ptr++ = TTY_FRAME;
-                    *tty->flip.char_buf_ptr++ = data;
+                    tty_insert_flip_char(tty, data, TTY_FRAME);
                 }else if(err & CyPARITY){
-                    *tty->flip.flag_buf_ptr++ = TTY_PARITY;
-                    *tty->flip.char_buf_ptr++ = data;
+                    tty_insert_flip_char(tty, data, TTY_PARITY);
                 }else if(err & CyOVERRUN){
-                    *tty->flip.flag_buf_ptr++ = TTY_OVERRUN;
-                    *tty->flip.char_buf_ptr++ = 0;
+                    tty_insert_flip_char(tty, 0, TTY_OVERRUN);
                     /*
                        If the flip buffer itself is
                        overflowing, we still loose
                        the next incoming character.
                      */
-                    if(tty->flip.count < TTY_FLIPBUF_SIZE){
-                        tty->flip.count++;
-                        *tty->flip.flag_buf_ptr++ = TTY_NORMAL;
-                        *tty->flip.char_buf_ptr++ = data;
-                    }
+                    tty_insert_flip_char(tty, data, TTY_NORMAL);
+                }
                 /* These two conditions may imply */
                 /* a normal read should be done. */
                 /* else if(data & CyTIMEOUT) */
                 /* else if(data & CySPECHAR) */
                 }else{
-                    *tty->flip.flag_buf_ptr++ = 0;
-                    *tty->flip.char_buf_ptr++ = 0;
+                    tty_insert_flip_char(tty, 0, TTY_NORMAL);
                 }
             }else{
-                *tty->flip.flag_buf_ptr++ = 0;
-                *tty->flip.char_buf_ptr++ = 0;
+                    tty_insert_flip_char(tty, data, TTY_NORMAL);
             }
         }else{
             /* there was a software buffer overrun
@@ -692,12 +682,7 @@ cd2401_rx_interrupt(int irq, void *dev_id, struct pt_regs *fp)
 #endif
         while(char_count--){
             data = base_addr[CyRDR];
-            if (tty->flip.count >= TTY_FLIPBUF_SIZE){
-                continue;
-            }
-            tty->flip.count++;
-            *tty->flip.flag_buf_ptr++ = TTY_NORMAL;
-            *tty->flip.char_buf_ptr++ = data;
+            tty_insert_flip_char(tty, data, TTY_NORMAL);
 #ifdef CYCLOM_16Y_HACK
             udelay(10L);
 #endif