diff options
| author | Mark Brown <broonie@kernel.org> | 2016-10-28 18:33:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-10-28 18:33:24 +0100 |
| commit | 990fcfefc925a959e204a44fc479efcc236ebced (patch) | |
| tree | 207452dfd2502b216c568e75c65583fdf43a9e81 /sound/soc/samsung/pcm.c | |
| parent | 2ef9555bd13d00c63fdbe3cdca6ab0e2ded42695 (diff) | |
| parent | 73f5dfc68316bef2ab7062ecdefd4b0ca941b4c1 (diff) | |
| download | linux-990fcfefc925a959e204a44fc479efcc236ebced.tar.gz | |
Merge branch 'fix/samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-samsung
Diffstat (limited to 'sound/soc/samsung/pcm.c')
| -rw-r--r-- | sound/soc/samsung/pcm.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index 43e367a9acc3..c484985812ed 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -565,24 +565,25 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) pcm->dma_capture = &s3c_pcm_stereo_in[pdev->id]; pcm->dma_playback = &s3c_pcm_stereo_out[pdev->id]; + ret = samsung_asoc_dma_platform_register(&pdev->dev, filter, + NULL, NULL); + if (ret) { + dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret); + goto err5; + } + pm_runtime_enable(&pdev->dev); ret = devm_snd_soc_register_component(&pdev->dev, &s3c_pcm_component, &s3c_pcm_dai[pdev->id], 1); if (ret != 0) { dev_err(&pdev->dev, "failed to get register DAI: %d\n", ret); - goto err5; - } - - ret = samsung_asoc_dma_platform_register(&pdev->dev, filter, - NULL, NULL); - if (ret) { - dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret); - goto err5; + goto err6; } return 0; - +err6: + pm_runtime_disable(&pdev->dev); err5: clk_disable_unprepare(pcm->pclk); err4: |