* [PATCH] ASoC: Complete initialisation before registering Samsung PCM DAI
@ 2011-12-12 11:08 Mark Brown
2011-12-14 5:40 ` Sangbeom Kim
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2011-12-12 11:08 UTC (permalink / raw)
To: Sangbeom Kim, Liam Girdwood; +Cc: alsa-devel, patches, Mark Brown
Otherwise there's a race where the DAI might get used without everything
having been set up.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
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 beef63f..3a29c26 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:
--
1.7.7.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: Complete initialisation before registering Samsung PCM DAI
2011-12-12 11:08 [PATCH] ASoC: Complete initialisation before registering Samsung PCM DAI Mark Brown
@ 2011-12-14 5:40 ` Sangbeom Kim
0 siblings, 0 replies; 2+ messages in thread
From: Sangbeom Kim @ 2011-12-14 5:40 UTC (permalink / raw)
To: 'Mark Brown', 'Liam Girdwood'; +Cc: alsa-devel, patches
On Monday, December 12, 2011 8:09 PM, Mark Brown wrote:
> Otherwise there's a race where the DAI might get used without everything
> having been set up.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> 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 beef63f..3a29c26 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:
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
Thanks,
Sangbeom
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-14 5:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-12 11:08 [PATCH] ASoC: Complete initialisation before registering Samsung PCM DAI Mark Brown
2011-12-14 5:40 ` Sangbeom Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox