diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-06 00:11:16 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-11-04 11:25:57 +0000 |
| commit | da5d01f23bc1ff710797a563ca3616df95395a12 (patch) | |
| tree | ced896c49eb0879dfbfe65f984d89c5718151fd3 /drivers/tty/serial/omap-serial.c | |
| parent | SERIAL: omap: allow hardware assisted rts/cts modes to be disabled (diff) | |
| download | linux-dev-da5d01f23bc1ff710797a563ca3616df95395a12.tar.xz linux-dev-da5d01f23bc1ff710797a563ca3616df95395a12.zip | |
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/serial/omap-serial.c')
| -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 */ 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); |