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

[sitara-epos/sitara-epos-kernel.git] / sound / soc / davinci / davinci-i2s.c

diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 9e0e565e6ed9c2e9308e74e80f2bad50d8f58b28..e763d58e51f810881c5d61ec510a2f8cac10faf5 100644 (file)
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -658,7 +658,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       ioarea = request_mem_region(mem->start, (mem->end - mem->start) + 1,
+       ioarea = request_mem_region(mem->start, resource_size(mem),
                                    pdev->name);
        if (!ioarea) {
                dev_err(&pdev->dev, "McBSP region already claimed\n");
@@ -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;
-               goto err_free_mem;
+               goto err_release_clk;
        }
        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;
-               goto err_free_mem;
+               goto err_release_clk;
        }
        dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].channel = res->start;
        dev->dev = &pdev->dev;
@@ -724,14 +724,17 @@ static int davinci_i2s_probe(struct platform_device *pdev)
 
        ret = snd_soc_register_dai(&pdev->dev, &davinci_i2s_dai);
        if (ret != 0)
-               goto err_free_mem;
+               goto err_release_clk;
 
        return 0;
 
+err_release_clk:
+       clk_disable(dev->clk);
+       clk_put(dev->clk);
 err_free_mem:
        kfree(dev);
 err_release_region:
-       release_mem_region(mem->start, (mem->end - mem->start) + 1);
+       release_mem_region(mem->start, resource_size(mem));
 
        return ret;
 }
@@ -747,7 +750,7 @@ static int davinci_i2s_remove(struct platform_device *pdev)
        dev->clk = NULL;
        kfree(dev);
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       release_mem_region(mem->start, (mem->end - mem->start) + 1);
+       release_mem_region(mem->start, resource_size(mem));
 
        return 0;
 }