summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerge Semin <Sergey.Semin@baikalelectronics.ru>2020-07-23 03:33:56 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-29 17:14:39 +0200
commit0be160cf86f96dbc2d1cb74f9eef3581a2ad7971 (patch)
treee22181d48757183c8d99743c2ec7788eac064ef9
parent442fdef1b931181a45ce4fce68b7675f7a78ec3a (diff)
downloadlinux-0be160cf86f96dbc2d1cb74f9eef3581a2ad7971.tar.bz2
serial: 8250_dw: Pass the same rate to the clk round and set rate methods
Indeed according to the clk API if clk_round_rate() has successfully accepted a rate, then in order setup the clock with value returned by the clk_round_rate() the clk_set_rate() method must be called with the original rate value. Suggested-by: Russell King <linux@armlinux.org.uk> Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Link: https://lore.kernel.org/r/20200723003357.26897-4-Sergey.Semin@baikalelectronics.ru Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/8250/8250_dw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index 12866083731d..c1511f9244bb 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -275,15 +275,15 @@ dw8250_do_pm(struct uart_port *port, unsigned int state, unsigned int old)
static void dw8250_set_termios(struct uart_port *p, struct ktermios *termios,
struct ktermios *old)
{
- unsigned int baud = tty_termios_baud_rate(termios);
+ unsigned long newrate = tty_termios_baud_rate(termios) * 16;
struct dw8250_data *d = to_dw8250_data(p->private_data);
long rate;
int ret;
clk_disable_unprepare(d->clk);
- rate = clk_round_rate(d->clk, baud * 16);
+ rate = clk_round_rate(d->clk, newrate);
if (rate > 0) {
- ret = clk_set_rate(d->clk, rate);
+ ret = clk_set_rate(d->clk, newrate);
if (!ret)
p->uartclk = rate;
}