git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus-20190125' of git://git.kernel.dk/linux-block
[sfrench/cifs-2.6.git]
/
drivers
/
tty
/
serial
/
qcom_geni_serial.c
diff --git
a/drivers/tty/serial/qcom_geni_serial.c
b/drivers/tty/serial/qcom_geni_serial.c
index a72d6d9fb98340e6d283876a7f7b2f96c31479e0..38016609c7fa99b1726bcebe3ed04b1fd6a0c724 100644
(file)
--- a/
drivers/tty/serial/qcom_geni_serial.c
+++ b/
drivers/tty/serial/qcom_geni_serial.c
@@
-225,7
+225,7
@@
static unsigned int qcom_geni_serial_get_mctrl(struct uart_port *uport)
unsigned int mctrl = TIOCM_DSR | TIOCM_CAR;
u32 geni_ios;
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);
mctrl |= TIOCM_CTS;
} else {
geni_ios = readl_relaxed(uport->membase + SE_GENI_IOS);
@@
-241,7
+241,7
@@
static void qcom_geni_serial_set_mctrl(struct uart_port *uport,
{
u32 uart_manual_rfr = 0;
{
u32 uart_manual_rfr = 0;
- if (uart_console(uport)
|| !uart_cts_enabled(uport)
)
+ if (uart_console(uport))
return;
if (!(mctrl & TIOCM_RTS))
return;
if (!(mctrl & TIOCM_RTS))