Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[pandora-kernel.git] / drivers / tty / serial / lantiq.c

diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c
index 58cf279..96c1cac 100644 (file)
--- a/drivers/tty/serial/lantiq.c
+++ b/drivers/tty/serial/lantiq.c
@@ -338,21 +338,21 @@ lqasc_startup(struct uart_port *port)
                ASCCON_ROEN, port->membase + LTQ_ASC_CON);
 
        retval = request_irq(ltq_port->tx_irq, lqasc_tx_int,
-               IRQF_DISABLED, "asc_tx", port);
+               0, "asc_tx", port);
        if (retval) {
                pr_err("failed to request lqasc_tx_int\n");
                return retval;
        }
 
        retval = request_irq(ltq_port->rx_irq, lqasc_rx_int,
-               IRQF_DISABLED, "asc_rx", port);
+               0, "asc_rx", port);
        if (retval) {
                pr_err("failed to request lqasc_rx_int\n");
                goto err1;
        }
 
        retval = request_irq(ltq_port->err_irq, lqasc_err_int,
-               IRQF_DISABLED, "asc_err", port);
+               0, "asc_err", port);
        if (retval) {
                pr_err("failed to request lqasc_err_int\n");
                goto err2;
@@ -478,8 +478,10 @@ lqasc_set_termios(struct uart_port *port,
        spin_unlock_irqrestore(&ltq_asc_lock, flags);
 
        /* Don't rewrite B0 */
-        if (tty_termios_baud_rate(new))
+       if (tty_termios_baud_rate(new))
                tty_termios_encode_baud_rate(new, baud, baud);
+
+       uart_update_timeout(port, cflag, baud);
 }
 
 static const char*