diff options
| author | Chanwoo Choi | 2016-04-21 11:58:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-04-30 18:26:55 +0200 |
| commit | b8995f527aac143e83d3900ff39357651ea4e0f6 (patch) | |
| tree | 40c7477b8fa981a4201b9daeae7422f2bb67d0f5 /drivers/tty/serial/samsung.c | |
| parent | MIPS: ath79: make bootconsole wait for both THRE and TEMT (diff) | |
| download | kernel-qcow2-linux-b8995f527aac143e83d3900ff39357651ea4e0f6.tar.gz kernel-qcow2-linux-b8995f527aac143e83d3900ff39357651ea4e0f6.tar.xz kernel-qcow2-linux-b8995f527aac143e83d3900ff39357651ea4e0f6.zip | |
serial: samsung: Reorder the sequence of clock control when call s3c24xx_serial_set_termios()
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: Chanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/samsung.c')
| -rw-r--r-- | drivers/tty/serial/samsung.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index ac7f8df54406..99bb23161dd6 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -1271,6 +1271,8 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, /* check to see if we need to change clock source */ if (ourport->baudclk != clk) { + clk_prepare_enable(clk); + s3c24xx_serial_setsource(port, clk_sel); if (!IS_ERR(ourport->baudclk)) { @@ -1278,8 +1280,6 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, ourport->baudclk = ERR_PTR(-EINVAL); } - clk_prepare_enable(clk); - ourport->baudclk = clk; ourport->baudclk_rate = clk ? clk_get_rate(clk) : 0; } |