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

diff --cc sound/soc/fsl/fsl_spdif.c
Simple merge

diff --cc sound/soc/fsl/imx-ssi.c
index 57d6941676ffabc509754317337bf109e16376a3,02722897914d48c19ff1452d2875e09478796353..f5f248c91c16db7c3db5a50654bceedb0e81953f
--- 1/sound/soc/fsl/imx-ssi.c
--- 2/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);