1 files changed, 6 insertions, 10 deletions

diff --git a/drivers/tty/serial/sn_console.c b/drivers/tty/serial/sn_console.c
index 1c6de9f58699..f51ffdc696fd 100644
--- a/drivers/tty/serial/sn_console.c
+++ b/drivers/tty/serial/sn_console.c
@@ -457,8 +457,8 @@ static int sn_debug_printf(const char *fmt, ...)
 static void
 sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
 {
+        struct tty_port *tport = NULL;
         int ch;
-        struct tty_struct *tty;
 
         if (!port) {
                 printk(KERN_ERR "sn_receive_chars - port NULL so can't receive\n");
@@ -472,11 +472,7 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
 
         if (port->sc_port.state) {
                 /* The serial_core stuffs are initialized, use them */
-                tty = port->sc_port.state->port.tty;
-        }
-        else {
-                /* Not registered yet - can't pass to tty layer.  */
-                tty = NULL;
+                tport = &port->sc_port.state->port;
         }
 
         while (port->sc_ops->sal_input_pending()) {
@@ -516,15 +512,15 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
 #endif /* CONFIG_MAGIC_SYSRQ */
 
                 /* record the character to pass up to the tty layer */
-                if (tty) {
-                        if(tty_insert_flip_char(tty, ch, TTY_NORMAL) == 0)
+                if (tport) {
+                        if (tty_insert_flip_char(tport, ch, TTY_NORMAL) == 0)
                                 break;
                 }
                 port->sc_port.icount.rx++;
         }
 
-        if (tty)
-                tty_flip_buffer_push(tty);
+        if (tport)
+                tty_flip_buffer_push(tport);
 }
 
 /**