From: Lars-Peter Clausen <lars@metafoo.de>
Date: Sat, 1 Mar 2014 14:48:13 +0000 (+0100)
Subject: ASoC: pxa: Pass correct DAPM context to {corgi,poodle,spitz}_ext_control
X-Git-Tag: submit/tizen/20160607.132125~4775^2~1^2~4^2~2^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e14de47ac95fb25818294325cd77d520c90c6ced;p=sdk%2Femulator%2Femulator-kernel.git

ASoC: pxa: Pass correct DAPM context to {corgi,poodle,spitz}_ext_control

When calling {corgi,poodle,spitz}_ext_control() from the startup callback we
pass the CODEC's DAPM context instead of the card's DAPM context. This is not a
problem per se since all the DAPM functions in ext_control() fallback to widgets
from other DAPM contexts, but passing the card's context is more consistent.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index b51f880..916ff63 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -97,10 +97,9 @@ static void corgi_ext_control(struct snd_soc_dapm_context *dapm)
 static int corgi_startup(struct snd_pcm_substream *substream)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_codec *codec = rtd->codec;
 
 	/* check the jack status at stream startup */
-	corgi_ext_control(&codec->dapm);
+	corgi_ext_control(&rtd->card->dapm);
 
 	return 0;
 }
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 27c6c03..c6bdc6c 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -74,10 +74,9 @@ static void poodle_ext_control(struct snd_soc_dapm_context *dapm)
 static int poodle_startup(struct snd_pcm_substream *substream)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_codec *codec = rtd->codec;
 
 	/* check the jack status at stream startup */
-	poodle_ext_control(&codec->dapm);
+	poodle_ext_control(&rtd->card->dapm);
 
 	return 0;
 }
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index 0728c1eb..d1b6bf9 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -106,10 +106,9 @@ static void spitz_ext_control(struct snd_soc_dapm_context *dapm)
 static int spitz_startup(struct snd_pcm_substream *substream)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_codec *codec = rtd->codec;
 
 	/* check the jack status at stream startup */
-	spitz_ext_control(&codec->dapm);
+	spitz_ext_control(&rtd->card->dapm);
 
 	return 0;
 }