diff options
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) | |||
884 | 884 | ||
885 | clk = devm_clk_get(&pdev->dev, NULL); | 885 | clk = devm_clk_get(&pdev->dev, NULL); |
886 | if (IS_ERR(clk)) { | 886 | if (IS_ERR(clk)) { |
887 | if (PTR_ERR(clk) == -EPROBE_DEFER) { | 887 | ret = PTR_ERR(clk); |
888 | ret = -EPROBE_DEFER; | 888 | if (ret == -EPROBE_DEFER) |
889 | goto err_out; | 889 | goto err_out; |
890 | } | 890 | uartclk = 0; |
891 | } else { | ||
892 | clk_prepare_enable(clk); | ||
893 | uartclk = clk_get_rate(clk); | ||
894 | } | ||
895 | |||
896 | if (!uartclk) { | ||
891 | dev_notice(&pdev->dev, "Using default clock frequency\n"); | 897 | dev_notice(&pdev->dev, "Using default clock frequency\n"); |
892 | uartclk = s->chip->freq_std; | 898 | uartclk = s->chip->freq_std; |
893 | } else | 899 | } |
894 | uartclk = clk_get_rate(clk); | ||
895 | 900 | ||
896 | /* Check input frequency */ | 901 | /* Check input frequency */ |
897 | if ((uartclk < s->chip->freq_min) || (uartclk > s->chip->freq_max)) { | 902 | if ((uartclk < s->chip->freq_min) || (uartclk > s->chip->freq_max)) { |