]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
serial: two branches the same in timbuart_set_mctrl()
authorRoel Kluin <roel.kluin@gmail.com>
Tue, 27 Apr 2010 21:16:33 +0000 (14:16 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 21 May 2010 16:34:29 +0000 (09:34 -0700)
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>
drivers/serial/timbuart.c

index 786ba85c170ba622d638a010fc27b1c1213142a3..62f389fdc2a3221b9c2c1c8264f144c9acbe6a00 100644 (file)
@@ -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)