aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2014-07-31 02:53:03 -0400
committerMark Brown <broonie@linaro.org>2014-07-31 15:36:34 -0400
commit7c63f3c02f5a998621758239abed43c5bd454b70 (patch)
tree67b42ca48a55cfe41cf0da20a64d1ded4b71a8c1 /sound/soc/sh
parent4f8f86aa41232cc4595136f18013324482fdf749 (diff)
ASoC: rsnd: fixup pcm_new callback method
bff58ea4f43d9b4a9fd6fb05fabc8f50f68131f5 (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>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r--sound/soc/sh/rcar/core.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index f07742f1eb11..d7c669790dd4 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -944,19 +944,17 @@ static struct snd_pcm_ops rsnd_pcm_ops = {
944 944
945static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd) 945static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)
946{ 946{
947 struct rsnd_priv *priv = snd_soc_dai_get_drvdata(rtd->cpu_dai); 947 struct snd_soc_dai *dai = rtd->cpu_dai;
948 struct rsnd_dai *rdai; 948 struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
949 int i, ret; 949 int ret;
950 950
951 for_each_rsnd_dai(rdai, priv, i) { 951 ret = rsnd_dai_call(pcm_new, &rdai->playback, rdai, rtd);
952 ret = rsnd_dai_call(pcm_new, &rdai->playback, rdai, rtd); 952 if (ret)
953 if (ret) 953 return ret;
954 return ret;
955 954
956 ret = rsnd_dai_call(pcm_new, &rdai->capture, rdai, rtd); 955 ret = rsnd_dai_call(pcm_new, &rdai->capture, rdai, rtd);
957 if (ret) 956 if (ret)
958 return ret; 957 return ret;
959 }
960 958
961 return snd_pcm_lib_preallocate_pages_for_all( 959 return snd_pcm_lib_preallocate_pages_for_all(
962 rtd->pcm, 960 rtd->pcm,