diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-10-24 11:03:35 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-10-24 11:03:35 -0400 |
| commit | 2bf6f675fa1a0f80b21aff20e6c21e87d6a7c9c9 (patch) | |
| tree | ef49d741211dcc4f38636b5c422c9c346da09adf /drivers/tty | |
| parent | 5762c20593b6b959f1470dc6f1ff4ca4d9570f8d (diff) | |
| parent | c3b92c8787367a8bb53d57d9789b558f1295cc96 (diff) | |
Merge commit 'v3.1' into devicetree/next
Diffstat (limited to 'drivers/tty')
| -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 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, | |||
| 478 | spin_unlock_irqrestore(<q_asc_lock, flags); | 478 | spin_unlock_irqrestore(<q_asc_lock, flags); |
| 479 | 479 | ||
| 480 | /* Don't rewrite B0 */ | 480 | /* Don't rewrite B0 */ |
| 481 | if (tty_termios_baud_rate(new)) | 481 | if (tty_termios_baud_rate(new)) |
| 482 | tty_termios_encode_baud_rate(new, baud, baud); | 482 | tty_termios_encode_baud_rate(new, baud, baud); |
| 483 | |||
| 484 | uart_update_timeout(port, cflag, baud); | ||
| 483 | } | 485 | } |
| 484 | 486 | ||
| 485 | static const char* | 487 | static const char* |