SERIAL: omap: allow hardware assisted IXANY mode to be disabled
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 5 Oct 2012 23:11:16 +0000 (00:11 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 4 Nov 2012 11:25:57 +0000 (11:25 +0000)
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>
drivers/tty/serial/omap-serial.c

index b6a1925dfc9290e1cc03f203a31793994ee9290e..f5b2f395af2dc584d0e357d0eb48829209b10636 100644 (file)
@@ -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);