diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-31 21:19:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-31 21:19:31 +0200 |
| commit | fbf2045af7691fbab2fd9f6d6fa96839bea13d31 (patch) | |
| tree | 4c3c235799a4ff12900ab023254c52e4209ad7d4 /sound/soc/fsl | |
| parent | a97bda7d29d02a2e9c6609d0947b15e55f5200e5 (diff) | |
| parent | fbe42f66c66c279b4ed9b8f515058a09bc731c49 (diff) | |
| download | linux-3.10-fbf2045af7691fbab2fd9f6d6fa96839bea13d31.tar.gz linux-3.10-fbf2045af7691fbab2fd9f6d6fa96839bea13d31.tar.bz2 linux-3.10-fbf2045af7691fbab2fd9f6d6fa96839bea13d31.zip | |
Merge tag 'asoc-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: A few bug fixes for the merge window
Small driver-specific updates.
Diffstat (limited to 'sound/soc/fsl')
| -rw-r--r-- | sound/soc/fsl/imx-ssi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index cf3ed0362c9..28dd76c7cb1 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); |