Skip to contentSkip to conversation

ASoC: rsnd: fixup pcm_new callback method

PATCH Applied Kuninori Morimoto 2 participants 2 messages Jul 31, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: rsnd: fixup pcm_new callback method

From: Kuninori Morimoto <[email protected]>

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.

---
 sound/soc/sh/rcar/core.c |   20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)
sound/soc/sh/rcar/core.c +9 -11
index f07742f..d7c6697 100644
@@ -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,
Signature · 1 line
1.7.9.5
maintainer Applied
#1 lore raw
Quoted 7 lines · Kuninori Morimoto

From: Kuninori Morimoto <[email protected]>

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.

Applied, thanks.