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

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

diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 86918ee12419e7fd3ff626bdb2ccd18a1bd09021..e7ae621a3afa138740690b308efdc92cb46a0f7b 100644 (file)
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -715,9 +715,6 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
        int word_length;
        u8 fifo_level;
 
-       cpu_dai->capture_dma_data = dev->dma_params;
-       cpu_dai->playback_dma_data = dev->dma_params;
-
        davinci_hw_common_param(dev, substream->stream);
        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                fifo_level = dev->txnumevt;
@@ -799,7 +796,17 @@ static int davinci_mcasp_trigger(struct snd_pcm_substream *substream,
        return ret;
 }
 
+static int davinci_mcasp_startup(struct snd_pcm_substream *substream,
+                                struct snd_soc_dai *dai)
+{
+       struct davinci_audio_dev *dev = snd_soc_dai_get_drvdata(dai);
+
+       snd_soc_dai_set_dma_data(dai, substream, dev->dma_params);
+       return 0;
+}
+
 static struct snd_soc_dai_ops davinci_mcasp_dai_ops = {
+       .startup        = davinci_mcasp_startup,
        .trigger        = davinci_mcasp_trigger,
        .hw_params      = davinci_mcasp_hw_params,
        .set_fmt        = davinci_mcasp_set_dai_fmt,
@@ -861,7 +868,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
        }
 
        ioarea = request_mem_region(mem->start,
-                       (mem->end - mem->start) + 1, pdev->name);
+                       resource_size(mem), pdev->name);
        if (!ioarea) {
                dev_err(&pdev->dev, "Audio region already claimed\n");
                ret = -EBUSY;
@@ -899,7 +906,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
        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;
@@ -914,7 +921,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
        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;
@@ -922,11 +929,14 @@ 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)
-               goto err_release_region;
+               goto err_release_clk;
        return 0;
 
+err_release_clk:
+       clk_disable(dev->clk);
+       clk_put(dev->clk);
 err_release_region:
-       release_mem_region(mem->start, (mem->end - mem->start) + 1);
+       release_mem_region(mem->start, resource_size(mem));
 err_release_data:
        kfree(dev);
 
@@ -944,7 +954,7 @@ static int davinci_mcasp_remove(struct platform_device *pdev)
        dev->clk = NULL;
 
        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));
 
        kfree(dev);