ASoC: Complete initialisation before registering Samsung PCM DAI
Subsystems (3)
PATCH 1/1 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 <[email protected]>
--- sound/soc/samsung/pcm.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
sound/soc/samsung/pcm.c +6 -6
@@ -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:
Signature · 1 line
1.7.7.3
Quoted 27 lines · Mark Brown
Otherwise there's a race where the DAI might get used without everything having been set up.
Signed-off-by Mark Brown <[email protected]>--- sound/soc/samsung/pcm.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)sound/soc/samsung/pcm.c +0
-6@@ -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 ;sound/soc/samsung/pcm.c +0
-0s3c_pcm_stereo_out[pdev->id].dma_addr = mem_res->start
sound/soc/samsung/pcm.c static __devinit int s3c_pcm_dev_probe(struct · line 587
Quoted 7 lines
sound/soc/samsung/pcm.c +3
-0@@ -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);
Quoted 6 lines
sound/soc/samsung/pcm.c +3
-0+ goto err5; + } +return 0 ;err5:
Acked-by Sangbeom Kim <[email protected]>
Thanks,
Sangbeom