aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/mxs-auart.c
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2013-03-16 15:25:02 +0000
committercodeworkx <codeworkx@cyanogenmod.org>2013-03-16 15:25:02 +0000
commitcba07183cc76b06a5ef2b20eef70d203dc5bcd5d (patch)
treee9847236fac724bbe929a5f2da2ad074ac47f120 /drivers/tty/serial/mxs-auart.c
parent1fb968ea5a15b9ff31c6345c3c4aad523985e024 (diff)
parent44655588a0b361afa15761b5c58f5a558c1c181c (diff)
downloadkernel_samsung_smdk4412-cba07183cc76b06a5ef2b20eef70d203dc5bcd5d.zip
kernel_samsung_smdk4412-cba07183cc76b06a5ef2b20eef70d203dc5bcd5d.tar.gz
kernel_samsung_smdk4412-cba07183cc76b06a5ef2b20eef70d203dc5bcd5d.tar.bz2
Merge branch 'cm-10.1-experimental' into HEAD
Diffstat (limited to 'drivers/tty/serial/mxs-auart.c')
-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 7e02c9c..5b3d063 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -368,6 +368,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)