Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eef6d7b8 authored by Vaibhav Bedia's avatar Vaibhav Bedia Committed by Mark Brown
Browse files

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: default avatarVaibhav Bedia <vaibhav.bedia@ti.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent d852f446

sound/soc/davinci/davinci-i2s.c

+6 −3
Original line number Diff line number Diff line
@@ -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,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)

		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:

sound/soc/davinci/davinci-mcasp.c

+6 −3
Original line number Diff line number Diff line
@@ -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;

		goto err_release_region;

		goto err_release_clk;

	}



	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;

		goto err_release_region;

		goto err_release_clk;

	}



	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)

		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, resource_size(mem));

err_release_data: