aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/8250
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-20 09:32:47 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-20 09:32:47 +0200
commitdf36f3e3fbb76d30d623a1623e31e3ce9c2fa750 (patch)
treef8f517a9812b2e94e89c2c0297ea0b235f312d12 /drivers/tty/serial/8250
parent65534736d9a5cab5340ae8819e1394b6325e8390 (diff)
parenta111daf0c53ae91e71fd2bfe7497862d14132e3e (diff)
downloadlinux-df36f3e3fbb76d30d623a1623e31e3ce9c2fa750.tar.gz
Merge tag 'v5.19-rc3' into tty-next
We need the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250')
-rw-r--r--drivers/tty/serial/8250/8250_port.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 953b0fadfd4c..3e3d784aa628 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -1505,6 +1505,8 @@ static inline void __stop_tx(struct uart_8250_port *p)
unsigned char lsr = serial_lsr_in(p);
u64 stop_delay = 0;
+ p->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
+
if (!(lsr & UART_LSR_THRE))
return;
/*