ASoC: fsl: fsl_asrc: Check for clk_prepare_enable() error
authorFabio Estevam <fabio.estevam@freescale.com>
Sat, 20 Jun 2015 21:00:13 +0000 (18:00 -0300)
committerMark Brown <broonie@kernel.org>
Tue, 7 Jul 2015 12:31:52 +0000 (13:31 +0100)
clk_prepare_enable() may fail, so we should better check its return value
and propagate it in the case of error.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/fsl/fsl_asrc.c

index c068494..9f087d4 100644 (file)
@@ -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)