summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorAlejandro Sierra <b18039@freescale.com>2012-11-21 10:01:26 -0600
committerAlejandro Sierra <b18039@freescale.com>2012-11-28 15:58:25 -0600
commit8ddd1ff44c745a94ab7bd2a8f4d0736e7e23c7e5 (patch)
tree6fb88ae6aa2226d009ee9c47dc1e4ddf78027747 /drivers/tty
parent1c382ea93a0f6d586a114cf4273874028c9e37a3 (diff)
ENGR00234466 UART: Fix disablement of CTS signal
On Uart driver, CTS signal were never disabled on the imx_set_mctrl function since the register was written inside of the conditional. if (mctrl & TIOCM_RTS) { temp |= UCR2_CTS; writel(temp, sport->port.membase + UCR2); } Signed-off-by: Alejandro Sierra <b18039@freescale.com>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/imx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index e76e5b9435b9..a512a7669d53 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -710,10 +710,10 @@ static void imx_set_mctrl(struct uart_port *port, unsigned int mctrl)
temp = readl(sport->port.membase + UCR2) & ~UCR2_CTS;
- if (mctrl & TIOCM_RTS) {
+ if (mctrl & TIOCM_RTS)
temp |= UCR2_CTS;
- writel(temp, sport->port.membase + UCR2);
- }
+
+ writel(temp, sport->port.membase + UCR2);
if (mctrl & TIOCM_LOOP) {
temp = readl(sport->port.membase + UTS) & ~UTS_LOOP;