ASoC: Davinci: Call clk_disable() and clk_put() in case of error

In case of any error in probe() function, clk_disable() and clk_put()
should be called if clk_enable() and clk_get() went through.

Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index f8c8487aba55d029bb00f1f6bba968a16ce6cf84..e763d58e51f810881c5d61ec510a2f8cac10faf5 100644 (file)
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -707,7 +707,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
        if (!res) {
                dev_err(&pdev->dev, "no DMA resource\n");
                ret = -ENXIO;
        if (!res) {
                dev_err(&pdev->dev, "no DMA resource\n");
                ret = -ENXIO;

-               goto err_free_mem;
+               goto err_release_clk;

        }
        dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK].channel = res->start;
 
        }
        dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK].channel = res->start;
 


@@ -715,7 +715,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
        if (!res) {
                dev_err(&pdev->dev, "no DMA resource\n");
                ret = -ENXIO;
        if (!res) {
                dev_err(&pdev->dev, "no DMA resource\n");
                ret = -ENXIO;

-               goto err_free_mem;
+               goto err_release_clk;

        }
        dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].channel = res->start;
        dev->dev = &pdev->dev;
        }
        dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].channel = res->start;
        dev->dev = &pdev->dev;


@@ -724,10 +724,13 @@ static int davinci_i2s_probe(struct platform_device *pdev)
 
        ret = snd_soc_register_dai(&pdev->dev, &davinci_i2s_dai);
        if (ret != 0)
 
        ret = snd_soc_register_dai(&pdev->dev, &davinci_i2s_dai);
        if (ret != 0)

-               goto err_free_mem;
+               goto err_release_clk;

 
        return 0;
 
 
        return 0;
 

+err_release_clk:
+       clk_disable(dev->clk);
+       clk_put(dev->clk);

 err_free_mem:
        kfree(dev);
 err_release_region:
 err_free_mem:
        kfree(dev);
 err_release_region:

diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 9b5d5ca37a974184fbebb25949a52a40141f581d..e7ae621a3afa138740690b308efdc92cb46a0f7b 100644 (file)
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -906,7 +906,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
        if (!res) {
                dev_err(&pdev->dev, "no DMA resource\n");
                ret = -ENODEV;
        if (!res) {
                dev_err(&pdev->dev, "no DMA resource\n");
                ret = -ENODEV;

-               goto err_release_region;
+               goto err_release_clk;

        }
 
        dma_data->channel = res->start;
        }
 
        dma_data->channel = res->start;


@@ -921,7 +921,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
        if (!res) {
                dev_err(&pdev->dev, "no DMA resource\n");
                ret = -ENODEV;
        if (!res) {
                dev_err(&pdev->dev, "no DMA resource\n");
                ret = -ENODEV;

-               goto err_release_region;
+               goto err_release_clk;

        }
 
        dma_data->channel = res->start;
        }
 
        dma_data->channel = res->start;


@@ -929,9 +929,12 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
        ret = snd_soc_register_dai(&pdev->dev, &davinci_mcasp_dai[pdata->op_mode]);
 
        if (ret != 0)
        ret = snd_soc_register_dai(&pdev->dev, &davinci_mcasp_dai[pdata->op_mode]);
 
        if (ret != 0)

-               goto err_release_region;
+               goto err_release_clk;

        return 0;
 
        return 0;
 

+err_release_clk:
+       clk_disable(dev->clk);
+       clk_put(dev->clk);

 err_release_region:
        release_mem_region(mem->start, resource_size(mem));
 err_release_data:
 err_release_region:
        release_mem_region(mem->start, resource_size(mem));
 err_release_data: