提交 ecd6b010 编写于 作者: P Pali Rohár 提交者: Greg Kroah-Hartman

serial: mvebu-uart: do not allow changing baudrate when uartclk is not available

Testing mvuart->clk for non-error is not enough as mvuart->clk may contain
valid clk pointer but when clk_prepare_enable(mvuart->clk) failed then
port->uartclk is zero.

When mvuart->clk is not available then port->uartclk is zero too.

Parent clock rate port->uartclk is needed to calculate UART clock divisor
and without it is not possible to change baudrate.

So fix test condition when it is possible to change baudrate.
Signed-off-by: NPali Rohár <pali@kernel.org>
Fixes: 68a0db1d ("serial: mvebu-uart: add function to change baudrate")
Link: https://lore.kernel.org/r/20210624224909.6350-3-pali@kernel.orgSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 9078204c
...@@ -445,12 +445,11 @@ static void mvebu_uart_shutdown(struct uart_port *port) ...@@ -445,12 +445,11 @@ static void mvebu_uart_shutdown(struct uart_port *port)
static int mvebu_uart_baud_rate_set(struct uart_port *port, unsigned int baud) static int mvebu_uart_baud_rate_set(struct uart_port *port, unsigned int baud)
{ {
struct mvebu_uart *mvuart = to_mvuart(port);
unsigned int d_divisor, m_divisor; unsigned int d_divisor, m_divisor;
u32 brdv, osamp; u32 brdv, osamp;
if (IS_ERR(mvuart->clk)) if (!port->uartclk)
return -PTR_ERR(mvuart->clk); return -EOPNOTSUPP;
/* /*
* The baudrate is derived from the UART clock thanks to two divisors: * The baudrate is derived from the UART clock thanks to two divisors:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册