diff options
Diffstat (limited to 'sound/soc/samsung/pcm.c')
-rw-r--r-- | sound/soc/samsung/pcm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index c86081992dfd..45f4a752d2a0 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c | |||
@@ -543,7 +543,7 @@ static __devinit int s3c_pcm_dev_probe(struct platform_device *pdev) | |||
543 | ret = PTR_ERR(pcm->cclk); | 543 | ret = PTR_ERR(pcm->cclk); |
544 | goto err1; | 544 | goto err1; |
545 | } | 545 | } |
546 | clk_enable(pcm->cclk); | 546 | clk_prepare_enable(pcm->cclk); |
547 | 547 | ||
548 | /* record our pcm structure for later use in the callbacks */ | 548 | /* record our pcm structure for later use in the callbacks */ |
549 | dev_set_drvdata(&pdev->dev, pcm); | 549 | dev_set_drvdata(&pdev->dev, pcm); |
@@ -568,7 +568,7 @@ static __devinit int s3c_pcm_dev_probe(struct platform_device *pdev) | |||
568 | ret = -ENOENT; | 568 | ret = -ENOENT; |
569 | goto err4; | 569 | goto err4; |
570 | } | 570 | } |
571 | clk_enable(pcm->pclk); | 571 | clk_prepare_enable(pcm->pclk); |
572 | 572 | ||
573 | s3c_pcm_stereo_in[pdev->id].dma_addr = mem_res->start | 573 | s3c_pcm_stereo_in[pdev->id].dma_addr = mem_res->start |
574 | + S3C_PCM_RXFIFO; | 574 | + S3C_PCM_RXFIFO; |
@@ -592,14 +592,14 @@ static __devinit int s3c_pcm_dev_probe(struct platform_device *pdev) | |||
592 | return 0; | 592 | return 0; |
593 | 593 | ||
594 | err5: | 594 | err5: |
595 | clk_disable(pcm->pclk); | 595 | clk_disable_unprepare(pcm->pclk); |
596 | clk_put(pcm->pclk); | 596 | clk_put(pcm->pclk); |
597 | err4: | 597 | err4: |
598 | iounmap(pcm->regs); | 598 | iounmap(pcm->regs); |
599 | err3: | 599 | err3: |
600 | release_mem_region(mem_res->start, resource_size(mem_res)); | 600 | release_mem_region(mem_res->start, resource_size(mem_res)); |
601 | err2: | 601 | err2: |
602 | clk_disable(pcm->cclk); | 602 | clk_disable_unprepare(pcm->cclk); |
603 | clk_put(pcm->cclk); | 603 | clk_put(pcm->cclk); |
604 | err1: | 604 | err1: |
605 | return ret; | 605 | return ret; |
@@ -619,8 +619,8 @@ static __devexit int s3c_pcm_dev_remove(struct platform_device *pdev) | |||
619 | mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 619 | mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
620 | release_mem_region(mem_res->start, resource_size(mem_res)); | 620 | release_mem_region(mem_res->start, resource_size(mem_res)); |
621 | 621 | ||
622 | clk_disable(pcm->cclk); | 622 | clk_disable_unprepare(pcm->cclk); |
623 | clk_disable(pcm->pclk); | 623 | clk_disable_unprepare(pcm->pclk); |
624 | clk_put(pcm->pclk); | 624 | clk_put(pcm->pclk); |
625 | clk_put(pcm->cclk); | 625 | clk_put(pcm->cclk); |
626 | 626 | ||