summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2010-04-27 14:16:33 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-21 09:34:29 -0700
commit44051996230510ccb125cfa552d464950d1767b9 (patch)
treef014bf034466fafa6d53cea65cc477642939967d
parente5bbbb18d872cb4e29815a000485c2c5eebcfaca (diff)
serial: two branches the same in timbuart_set_mctrl()
CTS is a read only bit and we are to stop signal RTS if modem line TIOCM_RTS is not set. Thanks for suggestions by Richard Röjfors. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: Richard Röjfors <richard.rojfors@pelagicore.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/serial/timbuart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/timbuart.c b/drivers/serial/timbuart.c
index 786ba85c170b..62f389fdc2a3 100644
--- a/drivers/serial/timbuart.c
+++ b/drivers/serial/timbuart.c
@@ -220,7 +220,7 @@ static void timbuart_set_mctrl(struct uart_port *port, unsigned int mctrl)
if (mctrl & TIOCM_RTS)
iowrite8(TIMBUART_CTRL_RTS, port->membase + TIMBUART_CTRL);
else
- iowrite8(TIMBUART_CTRL_RTS, port->membase + TIMBUART_CTRL);
+ iowrite8(0, port->membase + TIMBUART_CTRL);
}
static void timbuart_mctrl_check(struct uart_port *port, u32 isr, u32 *ier)