aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial
diff options
context:
space:
mode:
authorLukas Wunner <lukas@wunner.de>2017-10-21 10:50:18 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-23 11:22:58 +0200
commit2a71de2f7366fb1aec632116d0549ec56d6a3940 (patch)
tree1acdbfae1a8e6f9ed50cd3bcc9f85df28dd11736 /drivers/tty/serial
parentomap_serial: Removing superfluous check on no interrupt pending. (diff)
downloadlinux-dev-2a71de2f7366fb1aec632116d0549ec56d6a3940.tar.xz
linux-dev-2a71de2f7366fb1aec632116d0549ec56d6a3940.zip
serial: omap: Fix EFR write on RTS deassertion
Commit 348f9bb31c56 ("serial: omap: Fix RTS handling") sought to enable auto RTS upon manual RTS assertion and disable it on deassertion. However it seems the latter was done incorrectly, it clears all bits in the Extended Features Register *except* auto RTS. Fixes: 348f9bb31c56 ("serial: omap: Fix RTS handling") Cc: Peter Hurley <peter@hurleysoftware.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Lukas Wunner <lukas@wunner.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r--drivers/tty/serial/omap-serial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 7b183fc789c8..47ba9177a714 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -693,7 +693,7 @@ static void serial_omap_set_mctrl(struct uart_port *port, unsigned int mctrl)
if ((mctrl & TIOCM_RTS) && (port->status & UPSTAT_AUTORTS))
up->efr |= UART_EFR_RTS;
else
- up->efr &= UART_EFR_RTS;
+ up->efr &= ~UART_EFR_RTS;
serial_out(up, UART_EFR, up->efr);
serial_out(up, UART_LCR, lcr);