summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-10-06 00:11:16 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-11-04 11:25:57 +0000
commitda5d01f23bc1ff710797a563ca3616df95395a12 (patch)
treeced896c49eb0879dfbfe65f984d89c5718151fd3 /drivers
parent0d5b16639523970db001e6af298e360782f4d89a (diff)
downloadlinux-da5d01f23bc1ff710797a563ca3616df95395a12.tar.bz2
SERIAL: omap: allow hardware assisted IXANY mode to be disabled
Nothing was clearing the UART_MCR_XONANY bit, so once the ixany mode gets set, there's no possibility to disable it. Clear this bit when IXANY mode is cleared. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/serial/omap-serial.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index b6a1925dfc92..f5b2f395af2d 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -698,6 +698,8 @@ serial_omap_configure_xonxoff
*/
if (termios->c_iflag & IXANY)
up->mcr |= UART_MCR_XONANY;
+ else
+ up->mcr &= ~UART_MCR_XONANY;
serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR);
serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);