diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-20 14:29:37 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-20 14:29:37 +0200 |
commit | 642073c306e66daca108cb630d169129e50a6ba3 (patch) | |
tree | fe2edb842a30b67d369e5934602560aa3719b02e /drivers/tty/serial/fsl_lpuart.c | |
parent | e67d7f60d2382677c25de10b2e4d8d3717ace91f (diff) | |
parent | b320441c04c9bea76cbee1196ae55c20288fd7a6 (diff) | |
download | lwn-642073c306e66daca108cb630d169129e50a6ba3.tar.gz lwn-642073c306e66daca108cb630d169129e50a6ba3.zip |
Merge commit b320441c04c9 ("Merge tag 'tty-6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty") into tty-next
We need the serial-core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/fsl_lpuart.c')
-rw-r--r-- | drivers/tty/serial/fsl_lpuart.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index f6644c5989d3..f72e1340b47d 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -1120,8 +1120,8 @@ static void lpuart_copy_rx_to_tty(struct lpuart_port *sport) unsigned long sr = lpuart32_read(&sport->port, UARTSTAT); if (sr & (UARTSTAT_PE | UARTSTAT_FE)) { - /* Read DR to clear the error flags */ - lpuart32_read(&sport->port, UARTDATA); + /* Clear the error flags */ + lpuart32_write(&sport->port, sr, UARTSTAT); if (sr & UARTSTAT_PE) sport->port.icount.parity++; |