From: Sangbeom Kim <sbkim73@samsung.com>
To: 'Mark Brown' <broonie@opensource.wolfsonmicro.com>,
'Liam Girdwood' <lrg@ti.com>
Cc: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com
Subject: Re: [PATCH] ASoC: Complete initialisation before registering Samsung PCM DAI
Date: Wed, 14 Dec 2011 14:40:54 +0900 [thread overview]
Message-ID: <03cc01ccba22$f23621b0$d6a26510$@com> (raw)
In-Reply-To: <1323688113-32580-1-git-send-email-broonie@opensource.wolfsonmicro.com>
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
prev parent reply other threads:[~2011-12-14 5:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-12 11:08 [PATCH] ASoC: Complete initialisation before registering Samsung PCM DAI Mark Brown
2011-12-14 5:40 ` Sangbeom Kim [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='03cc01ccba22$f23621b0$d6a26510$@com' \
--to=sbkim73@samsung.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lrg@ti.com \
--cc=patches@opensource.wolfsonmicro.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.