From: Mark Brown <broonie@linaro.org>
Date: Thu, 24 Oct 2013 10:24:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8ff9f38bda4d7a49eb7afd203cddcb5d79236061;p=linux-beck.git

Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
---

8ff9f38bda4d7a49eb7afd203cddcb5d79236061
diff --cc sound/soc/fsl/imx-ssi.c
index 57d6941676ff,02722897914d..f5f248c91c16
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@@ -610,10 -610,11 +610,9 @@@ static int imx_ssi_probe(struct platfor
  
  	return 0;
  
 -failed_pcm_dma:
 -	imx_pcm_fiq_exit(pdev);
 -failed_pcm_fiq:
 +failed_pcm:
  	snd_soc_unregister_component(&pdev->dev);
  failed_register:
- 	release_mem_region(res->start, resource_size(res));
  	clk_disable_unprepare(ssi->clk);
  failed_clk:
  	snd_soc_set_ac97_ops(NULL);
@@@ -623,14 -624,10 +622,13 @@@
  
  static int imx_ssi_remove(struct platform_device *pdev)
  {
- 	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  	struct imx_ssi *ssi = platform_get_drvdata(pdev);
  
 -	imx_pcm_dma_exit(pdev);
 -	imx_pcm_fiq_exit(pdev);
 +	if (!ssi->dma_init)
 +		imx_pcm_dma_exit(pdev);
 +
 +	if (!ssi->fiq_init)
 +		imx_pcm_fiq_exit(pdev);
  
  	snd_soc_unregister_component(&pdev->dev);