Skip to content

Commit

Permalink
ASoC: rsnd: fixup pcm_new callback method
Browse files Browse the repository at this point in the history
bff58ea
(ASoC: rsnd: add DVC support) added DVC support,
and it added pcm_new callback feature for it.
Then it called all DAI's pcm_new callback, and it was wrong.
This patch fixup it and call correct callback.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Jul 31, 2014
1 parent 4f8f86a commit 7c63f3c
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions sound/soc/sh/rcar/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -944,19 +944,17 @@ static struct snd_pcm_ops rsnd_pcm_ops = {

static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)
{
struct rsnd_priv *priv = snd_soc_dai_get_drvdata(rtd->cpu_dai);
struct rsnd_dai *rdai;
int i, ret;
struct snd_soc_dai *dai = rtd->cpu_dai;
struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
int ret;

for_each_rsnd_dai(rdai, priv, i) {
ret = rsnd_dai_call(pcm_new, &rdai->playback, rdai, rtd);
if (ret)
return ret;
ret = rsnd_dai_call(pcm_new, &rdai->playback, rdai, rtd);
if (ret)
return ret;

ret = rsnd_dai_call(pcm_new, &rdai->capture, rdai, rtd);
if (ret)
return ret;
}
ret = rsnd_dai_call(pcm_new, &rdai->capture, rdai, rtd);
if (ret)
return ret;

return snd_pcm_lib_preallocate_pages_for_all(
rtd->pcm,
Expand Down

0 comments on commit 7c63f3c

Please sign in to comment.