summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2014-09-10 21:06:28 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-24 06:19:35 +0200
commit8620d3e5382a3c172a7885fa67a70955ca930425 (patch)
tree33560d2661b1af68b80cc069f4fd9c7832f677d3 /drivers/tty
parentusb: serial: Remove unused tty->hw_stopped (diff)
downloadlinux-8620d3e5382a3c172a7885fa67a70955ca930425.tar.xz
linux-8620d3e5382a3c172a7885fa67a70955ca930425.zip
serial: bfin-uart: Fix auto CTS
Commit 64851636d568ae9f167cd5d1dcdbfe17e6eef73c, serial: bfin-uart: Remove ASYNC_CTS_FLOW flag for hardware automatic CTS, open-codes uart_handle_cts_change() when CONFIG_SERIAL_BFIN_HARD_CTSRTS to skip start and stop tx. But the CTS interrupt handler _still_ calls uart_handle_cts_change(); only call uart_handle_cts_change() if !CONFIG_SERIAL_BFIN_HARD_CTSRTS. cc: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/bfin_uart.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index fc9fbf3f24a7..7da9911e95f0 100644
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -122,8 +122,9 @@ static irqreturn_t bfin_serial_mctrl_cts_int(int irq, void *dev_id)
if (!status)
uport->hw_stopped = 1;
}
-#endif
+#else
uart_handle_cts_change(uport, status & TIOCM_CTS);
+#endif
return IRQ_HANDLED;
}