1 files changed, 30 insertions, 33 deletions

diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index fd43fb6f7cee..545402509cab 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -262,8 +262,7 @@ typedef struct _synclinkmp_info {
         bool sca_statctrl_requested;
 
         u32 misc_ctrl_value;
-        char flag_buf[MAX_ASYNC_BUFFER_SIZE];
-        char char_buf[MAX_ASYNC_BUFFER_SIZE];
+        char *flag_buf;
         bool drop_rts_on_tx_done;
 
         struct  _input_signal_events    input_signal_events;
@@ -762,7 +761,7 @@ static int open(struct tty_struct *tty, struct file *filp)
                 goto cleanup;
         }
 
-        info->port.tty->low_latency = (info->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        info->port.low_latency = (info->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
         spin_lock_irqsave(&info->netlock, flags);
         if (info->netcount) {
@@ -2008,9 +2007,6 @@ static void bh_handler(struct work_struct *work)
         SLMP_INFO *info = container_of(work, SLMP_INFO, task);
         int action;
 
-        if (!info)
-                return;
-
         if ( debug_level >= DEBUG_LEVEL_BH )
                 printk( "%s(%d):%s bh_handler() entry\n",
                         __FILE__,__LINE__,info->device_name);
@@ -2132,13 +2128,11 @@ static void isr_rxint(SLMP_INFO * info)
                         /* process break detection if tty control
                          * is not set to ignore it
                          */
-                        if ( tty ) {
-                                if (!(status & info->ignore_status_mask1)) {
-                                        if (info->read_status_mask1 & BRKD) {
-                                                tty_insert_flip_char(tty, 0, TTY_BREAK);
-                                                if (info->port.flags & ASYNC_SAK)
-                                                        do_SAK(tty);
-                                        }
+                        if (!(status & info->ignore_status_mask1)) {
+                                if (info->read_status_mask1 & BRKD) {
+                                        tty_insert_flip_char(&info->port, 0, TTY_BREAK);
+                                        if (tty && (info->port.flags & ASYNC_SAK))
+                                                do_SAK(tty);
                                 }
                         }
                 }
@@ -2170,7 +2164,6 @@ static void isr_rxrdy(SLMP_INFO * info)
 {
         u16 status;
         unsigned char DataByte;
-        struct tty_struct *tty = info->port.tty;
         struct  mgsl_icount *icount = &info->icount;
 
         if ( debug_level >= DEBUG_LEVEL_ISR )
@@ -2203,26 +2196,22 @@ static void isr_rxrdy(SLMP_INFO * info)
 
                         status &= info->read_status_mask2;
 
-                        if ( tty ) {
-                                if (status & PE)
-                                        flag = TTY_PARITY;
-                                else if (status & FRME)
-                                        flag = TTY_FRAME;
-                                if (status & OVRN) {
-                                        /* Overrun is special, since it's
-                                         * reported immediately, and doesn't
-                                         * affect the current character
-                                         */
-                                        over = true;
-                                }
+                        if (status & PE)
+                                flag = TTY_PARITY;
+                        else if (status & FRME)
+                                flag = TTY_FRAME;
+                        if (status & OVRN) {
+                                /* Overrun is special, since it's
+                                 * reported immediately, and doesn't
+                                 * affect the current character
+                                 */
+                                over = true;
                         }
                 }       /* end of if (error) */
 
-                if ( tty ) {
-                        tty_insert_flip_char(tty, DataByte, flag);
-                        if (over)
-                                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-                }
+                tty_insert_flip_char(&info->port, DataByte, flag);
+                if (over)
+                        tty_insert_flip_char(&info->port, 0, TTY_OVERRUN);
         }
 
         if ( debug_level >= DEBUG_LEVEL_ISR ) {
@@ -2232,8 +2221,7 @@ static void isr_rxrdy(SLMP_INFO * info)
                         icount->frame,icount->overrun);
         }
 
-        if ( tty )
-                tty_flip_buffer_push(tty);
+        tty_flip_buffer_push(&info->port);
 }
 
 static void isr_txeom(SLMP_INFO * info, unsigned char status)
@@ -3553,6 +3541,13 @@ static int alloc_tmp_rx_buf(SLMP_INFO *info)
         info->tmp_rx_buf = kmalloc(info->max_frame_size, GFP_KERNEL);
         if (info->tmp_rx_buf == NULL)
                 return -ENOMEM;
+        /* unused flag buffer to satisfy receive_buf calling interface */
+        info->flag_buf = kzalloc(info->max_frame_size, GFP_KERNEL);
+        if (!info->flag_buf) {
+                kfree(info->tmp_rx_buf);
+                info->tmp_rx_buf = NULL;
+                return -ENOMEM;
+        }
         return 0;
 }
 
@@ -3560,6 +3555,8 @@ static void free_tmp_rx_buf(SLMP_INFO *info)
 {
         kfree(info->tmp_rx_buf);
         info->tmp_rx_buf = NULL;
+        kfree(info->flag_buf);
+        info->flag_buf = NULL;
 }
 
 static int claim_resources(SLMP_INFO *info)