summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorDmitry Safonov <dima@arista.com>2019-12-13 03:06:29 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-18 17:04:56 +0300
commiteff0a31d4b08797197718d2ecfa34f5f088e085c (patch)
treee30467e69ed4e38f7dc8296207dd59de7b78d05f /drivers/tty
parentbb3ecd968b356f7a1399a7fe1fe98f3ab61632a9 (diff)
downloadlinux-eff0a31d4b08797197718d2ecfa34f5f088e085c.tar.xz
tty/serial: pmac_zilog: Don't check port->sysrq
uart_handle_sysrq_char() already handles it. Signed-off-by: Dmitry Safonov <dima@arista.com> Link: https://lore.kernel.org/r/20191213000657.931618-31-dima@arista.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/pch_uart.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index c625bf7b8a92..0a96217dba67 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -584,10 +584,8 @@ static int pch_uart_hal_read(struct eg20t_port *priv, unsigned char *buf,
if (uart_handle_break(port))
continue;
}
- if (port->sysrq) {
- if (uart_handle_sysrq_char(port, rbr))
- continue;
- }
+ if (uart_handle_sysrq_char(port, rbr))
+ continue;
buf[i++] = rbr;
}