From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 5 Oct 2012 23:11:16 +0000 (+0100)
Subject: SERIAL: omap: allow hardware assisted IXANY mode to be disabled
X-Git-Tag: v3.8-rc1~160^2~15
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=da5d01f23bc1ff710797a563ca3616df95395a12;p=linux.git

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

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