diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-07-21 13:58:19 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-07-21 13:58:19 +0800 |
| commit | 74b60e9f6f938d0cd4c7a71e583aee3cc6c5fbba (patch) | |
| tree | 15cbca70f3f6d7e10da7d82154a78e6ca35dca8c /drivers/tty/serial/samsung.c | |
| parent | f24f1475658431d60bcd4e6e5de951ba1663dd43 (diff) | |
| parent | 1d508e233d21a7848cf54d7d03b40dac2d9ea873 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-16.07-rt
Conflicts:
mm/swap.c
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 1e0d9b8c48c9..e42cb6bdd31d 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -1288,6 +1288,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)) { @@ -1295,8 +1297,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; } |