diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-05 19:11:16 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-11-04 06:25:57 -0500 |
commit | da5d01f23bc1ff710797a563ca3616df95395a12 (patch) | |
tree | ced896c49eb0879dfbfe65f984d89c5718151fd3 /drivers/tty | |
parent | 0d5b16639523970db001e6af298e360782f4d89a (diff) |
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/tty')
-rw-r--r-- | drivers/tty/serial/omap-serial.c | 2 |
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 | |||
698 | */ | 698 | */ |
699 | if (termios->c_iflag & IXANY) | 699 | if (termios->c_iflag & IXANY) |
700 | up->mcr |= UART_MCR_XONANY; | 700 | up->mcr |= UART_MCR_XONANY; |
701 | else | ||
702 | up->mcr &= ~UART_MCR_XONANY; | ||
701 | 703 | ||
702 | serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR); | 704 | serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR); |
703 | serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B); | 705 | serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B); |