r8169: prevent bit sign expansion error in mdio_write

[linux-2.6-omap-h63xx.git] / drivers / serial / ip22zilog.c

diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c
index c3abfb39f31650c207b16fe17d6ed778f5932bc9..f3257f708ef91161bb10469ac97c09f998eadf3d 100644 (file)
--- a/drivers/serial/ip22zilog.c
+++ b/drivers/serial/ip22zilog.c
@@ -862,6 +862,7 @@ ip22zilog_set_termios(struct uart_port *port, struct ktermios *termios,
        up->cflag = termios->c_cflag;
 
        ip22zilog_maybe_update_regs(up, ZILOG_CHANNEL_FROM_PORT(port));
+       uart_update_timeout(port, termios->c_cflag, baud);
 
        spin_unlock_irqrestore(&up->port.lock, flags);
 }
@@ -1017,6 +1018,8 @@ ip22serial_console_termios(struct console *con, char *options)
        }
 
        con->cflag = cflag | CS8;                       /* 8N1 */
+
+       uart_update_timeout(&ip22zilog_port_table[con->index].port, cflag, baud);
 }
 
 static int __init ip22zilog_console_setup(struct console *con, char *options)