Commit 1e694169 authored by Chanwoo Choi's avatar Chanwoo Choi Committed by Sasha Levin

serial: samsung: Reorder the sequence of clock control when call s3c24xx_serial_set_termios()

[ Upstream commit b8995f52 ]

This patch fixes the broken serial log when changing the clock source
of uart device. Before disabling the original clock source, this patch
enables the new clock source to protect the clock off state for a split second.
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent f02212dd
...@@ -749,6 +749,8 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, ...@@ -749,6 +749,8 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
/* check to see if we need to change clock source */ /* check to see if we need to change clock source */
if (ourport->baudclk != clk) { if (ourport->baudclk != clk) {
clk_prepare_enable(clk);
s3c24xx_serial_setsource(port, clk_sel); s3c24xx_serial_setsource(port, clk_sel);
if (!IS_ERR(ourport->baudclk)) { if (!IS_ERR(ourport->baudclk)) {
...@@ -756,8 +758,6 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, ...@@ -756,8 +758,6 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
ourport->baudclk = ERR_PTR(-EINVAL); ourport->baudclk = ERR_PTR(-EINVAL);
} }
clk_prepare_enable(clk);
ourport->baudclk = clk; ourport->baudclk = clk;
ourport->baudclk_rate = clk ? clk_get_rate(clk) : 0; ourport->baudclk_rate = clk ? clk_get_rate(clk) : 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment