diff options
author | John Stultz <john.stultz@linaro.org> | 2011-10-12 11:47:53 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-10-12 11:47:53 -0700 |
commit | 5145edef1efa16e6947c27c7487fac545e8b5939 (patch) | |
tree | 835d67bb642027c7abaa62246b450993d250a52f /drivers/tty/serial | |
parent | 451bdbef06b85c4e82538debfd7b295fa08fe501 (diff) | |
parent | 5d9d49c51678f5e4c37ce661b4573d73fb391040 (diff) |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebase
Conflicts:
drivers/usb/host/ehci-q.c
drivers/usb/host/ehci.h
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r-- | drivers/tty/serial/lantiq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c index 58cf279ed87..bc95f52cad8 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(<q_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* |