diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-05 19:43:23 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-05 19:43:23 -0800 |
| commit | 28e1445c650035668514df6f446c81f89990ac52 (patch) | |
| tree | c2e15675eb23c5ac3ca6841b1851abb95929f351 /drivers/tty/serial/serial_core.c | |
| parent | serial/sc16is7xx: Remove obsolete #ifset TIOC[SG]RS485 (diff) | |
| parent | tty: Prevent "read/write wait queue active!" log flooding (diff) | |
| download | linux-dev-28e1445c650035668514df6f446c81f89990ac52.tar.xz linux-dev-28e1445c650035668514df6f446c81f89990ac52.zip | |
Merge branch 'tty-linus' into 'tty-testing'
We need the fixes in drivers/tty/tty_io.c that were done in there for
future patches in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/serial_core.c')
| -rw-r--r-- | drivers/tty/serial/serial_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 3e36ecf98624..1a2d90fe86da 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -363,7 +363,7 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios, * The spd_hi, spd_vhi, spd_shi, spd_warp kludge... * Die! Die! Die! */ - if (baud == 38400) + if (try == 0 && baud == 38400) baud = altbaud; /* |