These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / soc / fsl / fsl_asrc.c

diff --git a/kernel/sound/soc/fsl/fsl_asrc.c b/kernel/sound/soc/fsl/fsl_asrc.c
index c068494..9f087d4 100644 (file)
--- a/kernel/sound/soc/fsl/fsl_asrc.c
+++ b/kernel/sound/soc/fsl/fsl_asrc.c
@@ -931,14 +931,29 @@ static int fsl_asrc_probe(struct platform_device *pdev)
 static int fsl_asrc_runtime_resume(struct device *dev)
 {
        struct fsl_asrc *asrc_priv = dev_get_drvdata(dev);
-       int i;
+       int i, ret;
 
-       clk_prepare_enable(asrc_priv->mem_clk);
-       clk_prepare_enable(asrc_priv->ipg_clk);
-       for (i = 0; i < ASRC_CLK_MAX_NUM; i++)
-               clk_prepare_enable(asrc_priv->asrck_clk[i]);
+       ret = clk_prepare_enable(asrc_priv->mem_clk);
+       if (ret)
+               return ret;
+       ret = clk_prepare_enable(asrc_priv->ipg_clk);
+       if (ret)
+               goto disable_mem_clk;
+       for (i = 0; i < ASRC_CLK_MAX_NUM; i++) {
+               ret = clk_prepare_enable(asrc_priv->asrck_clk[i]);
+               if (ret)
+                       goto disable_asrck_clk;
+       }
 
        return 0;
+
+disable_asrck_clk:
+       for (i--; i >= 0; i--)
+               clk_disable_unprepare(asrc_priv->asrck_clk[i]);
+       clk_disable_unprepare(asrc_priv->ipg_clk);
+disable_mem_clk:
+       clk_disable_unprepare(asrc_priv->mem_clk);
+       return ret;
 }
 
 static int fsl_asrc_runtime_suspend(struct device *dev)