From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 28 Jan 2019 07:22:00 +0000 (+0100)
Subject: Merge 5.0-rc4 into tty-next
X-Git-Tag: v5.1-rc1~143^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83b21ed0fc2a7b17c6b9d4f72f664841f797380b;p=thirdparty%2Fkernel%2Flinux.git

Merge 5.0-rc4 into tty-next

We need the tty and serial fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

83b21ed0fc2a7b17c6b9d4f72f664841f797380b
diff --cc drivers/tty/serial/qcom_geni_serial.c
index b650a3a0ab7da,38016609c7fa9..3bcec1c202191
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@@ -221,10 -225,10 +221,10 @@@ static unsigned int qcom_geni_serial_ge
  	unsigned int mctrl = TIOCM_DSR | TIOCM_CAR;
  	u32 geni_ios;
  
- 	if (uart_console(uport) || !uart_cts_enabled(uport)) {
+ 	if (uart_console(uport)) {
  		mctrl |= TIOCM_CTS;
  	} else {
 -		geni_ios = readl_relaxed(uport->membase + SE_GENI_IOS);
 +		geni_ios = readl(uport->membase + SE_GENI_IOS);
  		if (!(geni_ios & IO2_DATA_IN))
  			mctrl |= TIOCM_CTS;
  	}