summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2011-08-03 13:37:24 +0100
committerRalf Baechle <ralf@linux-mips.org>2011-09-21 17:53:25 +0200
commitb7867f1bfcb76c75d98d35f576fcd9d7759a96fe (patch)
treef1f3febda36adf7086de6027e4f3a264aea45cd0 /drivers
parent0596954681859f1b7b7adfd58fa738c09ed2affa (diff)
downloadlinux-stable-b7867f1bfcb76c75d98d35f576fcd9d7759a96fe.tar.gz
linux-stable-b7867f1bfcb76c75d98d35f576fcd9d7759a96fe.tar.bz2
linux-stable-b7867f1bfcb76c75d98d35f576fcd9d7759a96fe.zip
SERIAL: Lantiq: Set timeout in uart_port
Without this patch apps using readline hang. Signed-off-by: Thomas Langer <thomas.langer@lantiq.com> Signed-off-by: John Crispin <blogic@openwrt.org> Cc: linux-mips@linux-mips.org Cc: linux-serial@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/2687/ Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/serial/lantiq.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c
index 58cf279ed879..bc95f52cad8b 100644
--- a/drivers/tty/serial/lantiq.c
+++ b/drivers/tty/serial/lantiq.c
@@ -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*