From: Dmitry Safonov <dima@arista.com>
Date: Fri, 13 Dec 2019 00:06:29 +0000 (+0000)
Subject: tty/serial: pmac_zilog: Don't check port->sysrq
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=eff0a31d4b08797197718d2ecfa34f5f088e085c;p=linux.git

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>
---

diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index c625bf7b8a929..0a96217dba678 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;
 	}