summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLothar Waßmann <LW@KARO-electronics.de>2012-05-03 11:37:12 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-01 15:15:46 +0800
commit8e517a979cbbcf034ad019313d4e057c6f4c7e3b (patch)
treebb7c54e8c62372d09221d34240c33aef2e937acb /drivers
parent5404dd3464ae620fbcb9977a0690670f91544be1 (diff)
Add missing call to uart_update_timeout()
commit 8b979f7c6bf13a57e7b6002f1175312a44773960 upstream. This patch fixes a problem reported here: http://article.gmane.org/gmane.linux.ports.arm.kernel/155242/match=auart Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/serial/mxs-auart.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 55fd362b987..039c054349e 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -369,6 +369,8 @@ static void mxs_auart_settermios(struct uart_port *u,
writel(ctrl, u->membase + AUART_LINECTRL);
writel(ctrl2, u->membase + AUART_CTRL2);
+
+ uart_update_timeout(u, termios->c_cflag, baud);
}
static irqreturn_t mxs_auart_irq_handle(int irq, void *context)