Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
 "Just a few trivial driver-specific fixes."

* tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hdspm - Work around broken DDS value on PCI RME MADI
  ALSA: usb-audio: fix rate_list memory leak
  ASoC: fsi: bugfix: ensure dma is terminated
  ASoC: fsi: bugfix: correct dma area
  ASoC: fsi: bugfix: enable master clock control on DMA stream
  ASoC: imx-ssi: Use clk_prepare_enable/clk_disable_unprepare

1 files changed, 3 insertions, 3 deletions

diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index cf3ed0362c9c..28dd76c7cb1c 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -543,7 +543,7 @@ static int imx_ssi_probe(struct platform_device *pdev)
                         ret);
                 goto failed_clk;
         }
-        clk_enable(ssi->clk);
+        clk_prepare_enable(ssi->clk);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
@@ -641,7 +641,7 @@ failed_ac97:
 failed_ioremap:
         release_mem_region(res->start, resource_size(res));
 failed_get_resource:
-        clk_disable(ssi->clk);
+        clk_disable_unprepare(ssi->clk);
         clk_put(ssi->clk);
 failed_clk:
         kfree(ssi);
@@ -664,7 +664,7 @@ static int __devexit imx_ssi_remove(struct platform_device *pdev)
 
         iounmap(ssi->base);
         release_mem_region(res->start, resource_size(res));
-        clk_disable(ssi->clk);
+        clk_disable_unprepare(ssi->clk);
         clk_put(ssi->clk);
         kfree(ssi);