From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 20 Jun 2022 07:32:47 +0000 (+0200)
Subject: Merge tag 'v5.19-rc3' into tty-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=df36f3e3fbb76d30d623a1623e31e3ce9c2fa750;p=linux.git

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

df36f3e3fbb76d30d623a1623e31e3ce9c2fa750
diff --cc drivers/tty/serial/8250/8250_port.c
index 953b0fadfd4c4,8f32fe9e149e9..3e3d784aa628f
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@@ -1502,9 -1514,11 +1502,11 @@@ static inline void __stop_tx(struct uar
  	struct uart_8250_em485 *em485 = p->em485;
  
  	if (em485) {
 -		unsigned char lsr = serial_in(p, UART_LSR);
 +		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;
  		/*