From: Mark Brown Date: Mon, 12 Dec 2011 11:05:58 +0000 (+0800) Subject: ASoC: Complete initialisation before registering Samsung PCM DAI X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0c9f110574bdde21ac62b948272a90f6e72b94d8;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git ASoC: Complete initialisation before registering Samsung PCM DAI Otherwise there's a race where the DAI might get used without everything having been set up. Signed-off-by: Mark Brown Acked-by: Sangbeom Kim --- diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index beef63fca052..3a29c268ea5d 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -570,12 +570,6 @@ static __devinit int s3c_pcm_dev_probe(struct platform_device *pdev) } clk_enable(pcm->pclk); - ret = snd_soc_register_dai(&pdev->dev, &s3c_pcm_dai[pdev->id]); - if (ret != 0) { - dev_err(&pdev->dev, "failed to get pcm_clock\n"); - goto err5; - } - s3c_pcm_stereo_in[pdev->id].dma_addr = mem_res->start + S3C_PCM_RXFIFO; s3c_pcm_stereo_out[pdev->id].dma_addr = mem_res->start @@ -587,6 +581,12 @@ static __devinit 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 = snd_soc_register_dai(&pdev->dev, &s3c_pcm_dai[pdev->id]); + if (ret != 0) { + dev_err(&pdev->dev, "failed to get register DAI: %d\n", ret); + goto err5; + } + return 0; err5: