diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 09:09:04 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 09:09:04 +0300 |
commit | 2f5bb02ff22414ce156cacb163dd594b017af357 (patch) | |
tree | 5213feb307367fdffb993ed03ed3094ec92021ea /drivers/tty/serial/8250/8250_mid.c | |
parent | 2c507e464f791327c94d17a0137f00b4717744fc (diff) | |
parent | c6935931c1894ff857616ff8549b61236a19148f (diff) | |
download | linux-2f5bb02ff22414ce156cacb163dd594b017af357.tar.xz |
Merge 4.8-rc5 into driver-core-next
We want the sysfs and kernfs in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250/8250_mid.c')
-rw-r--r-- | drivers/tty/serial/8250/8250_mid.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/8250/8250_mid.c b/drivers/tty/serial/8250/8250_mid.c index 339de9cd0866..20c5db2f4264 100644 --- a/drivers/tty/serial/8250/8250_mid.c +++ b/drivers/tty/serial/8250/8250_mid.c @@ -168,6 +168,9 @@ static void mid8250_set_termios(struct uart_port *p, unsigned long w = BIT(24) - 1; unsigned long mul, div; + /* Gracefully handle the B0 case: fall back to B9600 */ + fuart = fuart ? fuart : 9600 * 16; + if (mid->board->freq < fuart) { /* Find prescaler value that satisfies Fuart < Fref */ if (mid->board->freq > baud) |