diff options
Diffstat (limited to 'sound/soc')
-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 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) | |||
543 | ret); | 543 | ret); |
544 | goto failed_clk; | 544 | goto failed_clk; |
545 | } | 545 | } |
546 | clk_enable(ssi->clk); | 546 | clk_prepare_enable(ssi->clk); |
547 | 547 | ||
548 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 548 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
549 | if (!res) { | 549 | if (!res) { |
@@ -641,7 +641,7 @@ failed_ac97: | |||
641 | failed_ioremap: | 641 | failed_ioremap: |
642 | release_mem_region(res->start, resource_size(res)); | 642 | release_mem_region(res->start, resource_size(res)); |
643 | failed_get_resource: | 643 | failed_get_resource: |
644 | clk_disable(ssi->clk); | 644 | clk_disable_unprepare(ssi->clk); |
645 | clk_put(ssi->clk); | 645 | clk_put(ssi->clk); |
646 | failed_clk: | 646 | failed_clk: |
647 | kfree(ssi); | 647 | kfree(ssi); |
@@ -664,7 +664,7 @@ static int __devexit imx_ssi_remove(struct platform_device *pdev) | |||
664 | 664 | ||
665 | iounmap(ssi->base); | 665 | iounmap(ssi->base); |
666 | release_mem_region(res->start, resource_size(res)); | 666 | release_mem_region(res->start, resource_size(res)); |
667 | clk_disable(ssi->clk); | 667 | clk_disable_unprepare(ssi->clk); |
668 | clk_put(ssi->clk); | 668 | clk_put(ssi->clk); |
669 | kfree(ssi); | 669 | kfree(ssi); |
670 | 670 | ||