diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-02 04:54:38 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-02 04:54:37 -0700 |
| commit | c38b8343986363b2ea42f82d68bfb79eab6bc7db (patch) | |
| tree | f07f98999bf6cc1a87ee3d9dd6d645dfcc17cada /drivers/tty/serial/sccnxp.c | |
| parent | 1c294945bcd0850d97d3e5a835f4d2a0f8db94cd (diff) | |
| parent | 0382cccfeeb0206e66e75abbc9aa7fbcc13a9f6c (diff) | |
Merge "Merge android-4.4.128 (89904cc) into msm-4.4"
Diffstat (limited to 'drivers/tty/serial/sccnxp.c')
| -rw-r--r-- | drivers/tty/serial/sccnxp.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c index fcf803ffad19..cdd2f942317c 100644 --- a/drivers/tty/serial/sccnxp.c +++ b/drivers/tty/serial/sccnxp.c @@ -884,14 +884,19 @@ static int sccnxp_probe(struct platform_device *pdev) clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(clk)) { - if (PTR_ERR(clk) == -EPROBE_DEFER) { - ret = -EPROBE_DEFER; + ret = PTR_ERR(clk); + if (ret == -EPROBE_DEFER) goto err_out; - } + uartclk = 0; + } else { + clk_prepare_enable(clk); + uartclk = clk_get_rate(clk); + } + + if (!uartclk) { dev_notice(&pdev->dev, "Using default clock frequency\n"); uartclk = s->chip->freq_std; - } else - uartclk = clk_get_rate(clk); + } /* Check input frequency */ if ((uartclk < s->chip->freq_min) || (uartclk > s->chip->freq_max)) { |