sound:starfive:Change the order about mclk_ext's operation

[platform/kernel/linux-starfive.git] / sound / soc / starfive / starfive_pdm.c

diff --git a/sound/soc/starfive/starfive_pdm.c b/sound/soc/starfive/starfive_pdm.c
old mode 100755 (executable)
new mode 100644 (file)
index 89f539c..d6c10d6
--- a/sound/soc/starfive/starfive_pdm.c
+++ b/sound/soc/starfive/starfive_pdm.c
@@ -296,12 +296,6 @@ static int sf_pdm_clock_init(struct platform_device *pdev, struct sf_pdm *priv)
                goto exit;
        }
 
-       ret = clk_set_parent(priv->clk_mclk, priv->clk_mclk_ext);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to set parent clk_mclk ret=%d\n", ret);
-               goto exit;
-       }
-
        ret = clk_prepare_enable(priv->clk_mclk);
        if (ret) {
                dev_err(&pdev->dev, "failed to prepare enable clk_mclk\n");
@@ -338,6 +332,12 @@ static int sf_pdm_clock_init(struct platform_device *pdev, struct sf_pdm *priv)
                goto err_clk_disable;
        }
 
+       ret = clk_set_parent(priv->clk_mclk, priv->clk_mclk_ext);
+       if (ret) {
+               dev_err(&pdev->dev, "failed to set parent clk_mclk ret=%d\n", ret);
+               goto err_clk_disable;
+       }
+
        return 0;
 
 err_clk_disable: