diff --git a/[refs] b/[refs] index 57c4e950a3a0..fafc07976ece 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7f3880cd9b98c5bf9391ae7acdec82b75403776 +refs/heads/master: 7bbe08d6b89fce09ae4e6a7ce62ccd3c279a31ce diff --git a/trunk/drivers/tty/serial/sunsab.c b/trunk/drivers/tty/serial/sunsab.c index 8de2213664e0..a422c8b55a47 100644 --- a/trunk/drivers/tty/serial/sunsab.c +++ b/trunk/drivers/tty/serial/sunsab.c @@ -203,7 +203,7 @@ receive_chars(struct uart_sunsab_port *up, flag = TTY_FRAME; } - if (uart_handle_sysrq_char(&up->port, ch)) + if (uart_handle_sysrq_char(&up->port, ch) || !port) continue; if ((stat->sreg.isr0 & (up->port.ignore_status_mask & 0xff)) == 0 && diff --git a/trunk/drivers/tty/serial/sunzilog.c b/trunk/drivers/tty/serial/sunzilog.c index 27669ff3d446..813ef8eb8eff 100644 --- a/trunk/drivers/tty/serial/sunzilog.c +++ b/trunk/drivers/tty/serial/sunzilog.c @@ -388,7 +388,7 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up, else if (r1 & CRC_ERR) flag = TTY_FRAME; } - if (uart_handle_sysrq_char(&up->port, ch)) + if (uart_handle_sysrq_char(&up->port, ch) || !port) continue; if (up->port.ignore_status_mask == 0xff ||