Merge tag 'v3.12'

[firefly-linux-kernel-4.4.55.git] / drivers / tty / bfin_jtag_comm.c

diff --git a/drivers/tty/bfin_jtag_comm.c b/drivers/tty/bfin_jtag_comm.c
index 1cfcdbf1d0ccd0a744cfa4a0c13f9fad9abf2f4f..a93a424873faf638a004a3cabbc5f381d381027a 100644 (file)
--- a/drivers/tty/bfin_jtag_comm.c
+++ b/drivers/tty/bfin_jtag_comm.c
@@ -95,18 +95,16 @@ bfin_jc_emudat_manager(void *arg)
 
                /* if incoming data is ready, eat it */
                if (bfin_read_DBGSTAT() & EMUDIF) {
-                       if (tty != NULL) {
-                               uint32_t emudat = bfin_read_emudat();
-                               if (inbound_len == 0) {
-                                       pr_debug("incoming length: 0x%08x\n", emudat);
-                                       inbound_len = emudat;
-                               } else {
-                                       size_t num_chars = (4 <= inbound_len ? 4 : inbound_len);
-                                       pr_debug("  incoming data: 0x%08x (pushing %zu)\n", emudat, num_chars);
-                                       inbound_len -= num_chars;
-                                       tty_insert_flip_string(tty, (unsigned char *)&emudat, num_chars);
-                                       tty_flip_buffer_push(tty);
-                               }
+                       uint32_t emudat = bfin_read_emudat();
+                       if (inbound_len == 0) {
+                               pr_debug("incoming length: 0x%08x\n", emudat);
+                               inbound_len = emudat;
+                       } else {
+                               size_t num_chars = (4 <= inbound_len ? 4 : inbound_len);
+                               pr_debug("  incoming data: 0x%08x (pushing %zu)\n", emudat, num_chars);
+                               inbound_len -= num_chars;
+                               tty_insert_flip_string(&port, (unsigned char *)&emudat, num_chars);
+                               tty_flip_buffer_push(&port);
                        }
                }