1 files changed, 39 insertions, 39 deletions

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index dcc0430a49c8..e0f80ce0cf8f 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -1067,9 +1067,9 @@ static void gsm_process_modem(struct tty_struct *tty, struct gsm_dlci *dlci,
                 if ((mlines & TIOCM_CD) == 0 && (dlci->modem_rx & TIOCM_CD))
                         if (!(tty->termios.c_cflag & CLOCAL))
                                 tty_hangup(tty);
-                if (brk & 0x01)
-                        tty_insert_flip_char(tty, 0, TTY_BREAK);
         }
+        if (brk & 0x01)
+                tty_insert_flip_char(&dlci->port, 0, TTY_BREAK);
         dlci->modem_rx = mlines;
 }
 
@@ -1137,7 +1137,7 @@ static void gsm_control_modem(struct gsm_mux *gsm, u8 *data, int clen)
 
 static void gsm_control_rls(struct gsm_mux *gsm, u8 *data, int clen)
 {
-        struct tty_struct *tty;
+        struct tty_port *port;
         unsigned int addr = 0 ;
         u8 bits;
         int len = clen;
@@ -1160,19 +1160,18 @@ static void gsm_control_rls(struct gsm_mux *gsm, u8 *data, int clen)
         bits = *dp;
         if ((bits & 1) == 0)
                 return;
-        /* See if we have an uplink tty */
-        tty = tty_port_tty_get(&gsm->dlci[addr]->port);
 
-        if (tty) {
-                if (bits & 2)
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-                if (bits & 4)
-                        tty_insert_flip_char(tty, 0, TTY_PARITY);
-                if (bits & 8)
-                        tty_insert_flip_char(tty, 0, TTY_FRAME);
-                tty_flip_buffer_push(tty);
-                tty_kref_put(tty);
-        }
+        port = &gsm->dlci[addr]->port;
+
+        if (bits & 2)
+                tty_insert_flip_char(port, 0, TTY_OVERRUN);
+        if (bits & 4)
+                tty_insert_flip_char(port, 0, TTY_PARITY);
+        if (bits & 8)
+                tty_insert_flip_char(port, 0, TTY_FRAME);
+
+        tty_flip_buffer_push(port);
+
         gsm_control_reply(gsm, CMD_RLS, data, clen);
 }
 
@@ -1545,36 +1544,37 @@ static void gsm_dlci_data(struct gsm_dlci *dlci, u8 *data, int clen)
 {
         /* krefs .. */
         struct tty_port *port = &dlci->port;
-        struct tty_struct *tty = tty_port_tty_get(port);
+        struct tty_struct *tty;
         unsigned int modem = 0;
         int len = clen;
 
         if (debug & 16)
-                pr_debug("%d bytes for tty %p\n", len, tty);
-        if (tty) {
-                switch (dlci->adaption)  {
-                /* Unsupported types */
-                /* Packetised interruptible data */
-                case 4:
-                        break;
-                /* Packetised uininterruptible voice/data */
-                case 3:
-                        break;
-                /* Asynchronous serial with line state in each frame */
-                case 2:
-                        while (gsm_read_ea(&modem, *data++) == 0) {
-                                len--;
-                                if (len == 0)
-                                        return;
-                        }
+                pr_debug("%d bytes for tty\n", len);
+        switch (dlci->adaption)  {
+        /* Unsupported types */
+        /* Packetised interruptible data */
+        case 4:
+                break;
+        /* Packetised uininterruptible voice/data */
+        case 3:
+                break;
+        /* Asynchronous serial with line state in each frame */
+        case 2:
+                while (gsm_read_ea(&modem, *data++) == 0) {
+                        len--;
+                        if (len == 0)
+                                return;
+                }
+                tty = tty_port_tty_get(port);
+                if (tty) {
                         gsm_process_modem(tty, dlci, modem, clen);
-                /* Line state will go via DLCI 0 controls only */
-                case 1:
-                default:
-                        tty_insert_flip_string(tty, data, len);
-                        tty_flip_buffer_push(tty);
+                        tty_kref_put(tty);
                 }
-                tty_kref_put(tty);
+        /* Line state will go via DLCI 0 controls only */
+        case 1:
+        default:
+                tty_insert_flip_string(port, data, len);
+                tty_flip_buffer_push(port);
         }
 }