diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 08:22:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 08:22:00 +0100 |
| commit | 83b21ed0fc2a7b17c6b9d4f72f664841f797380b (patch) | |
| tree | 99272c0f69b8d762bf82400e6bdb84146b5baadb /drivers/tty/serial/fsl_lpuart.c | |
| parent | sysrq: Remove duplicated sysrq message (diff) | |
| parent | Linux 5.0-rc4 (diff) | |
| download | linux-dev-83b21ed0fc2a7b17c6b9d4f72f664841f797380b.tar.xz linux-dev-83b21ed0fc2a7b17c6b9d4f72f664841f797380b.zip | |
Merge 5.0-rc4 into tty-next
We need the tty and serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/fsl_lpuart.c')
| -rw-r--r-- | drivers/tty/serial/fsl_lpuart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 5e13946edc3b..d0a98ec0ff6c 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -1709,7 +1709,7 @@ lpuart32_set_termios(struct uart_port *port, struct ktermios *termios, } /* ask the core to calculate the divisor */ - baud = uart_get_baud_rate(port, termios, old, 50, port->uartclk / 16); + baud = uart_get_baud_rate(port, termios, old, 50, port->uartclk / 4); spin_lock_irqsave(&sport->port.lock, flags); |