Эх сурвалжийг харах

ASoC: Fix forgotten replacements of socdev->codec

The snd_soc_codec was moved into socdev->card, but this change wasn't
applied in some places.  Fixed now.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 16 жил өмнө
parent
commit
9e30d7718b

+ 1 - 1
sound/soc/omap/n810.c

@@ -72,7 +72,7 @@ static int n810_startup(struct snd_pcm_substream *substream)
 {
 {
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_codec *codec = rtd->socdev->codec;
+	struct snd_soc_codec *codec = rtd->socdev->card->codec;
 
 
 	snd_pcm_hw_constraint_minmax(runtime,
 	snd_pcm_hw_constraint_minmax(runtime,
 				     SNDRV_PCM_HW_PARAM_CHANNELS, 2, 2);
 				     SNDRV_PCM_HW_PARAM_CHANNELS, 2, 2);

+ 1 - 1
sound/soc/pxa/corgi.c

@@ -100,7 +100,7 @@ static void corgi_ext_control(struct snd_soc_codec *codec)
 static int corgi_startup(struct snd_pcm_substream *substream)
 static int corgi_startup(struct snd_pcm_substream *substream)
 {
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_codec *codec = rtd->socdev->codec;
+	struct snd_soc_codec *codec = rtd->socdev->card->codec;
 
 
 	/* check the jack status at stream startup */
 	/* check the jack status at stream startup */
 	corgi_ext_control(codec);
 	corgi_ext_control(codec);

+ 1 - 1
sound/soc/pxa/palm27x.c

@@ -55,7 +55,7 @@ static void palm27x_ext_control(struct snd_soc_codec *codec)
 static int palm27x_startup(struct snd_pcm_substream *substream)
 static int palm27x_startup(struct snd_pcm_substream *substream)
 {
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_codec *codec = rtd->socdev->codec;
+	struct snd_soc_codec *codec = rtd->socdev->card->codec;
 
 
 	/* check the jack status at stream startup */
 	/* check the jack status at stream startup */
 	palm27x_ext_control(codec);
 	palm27x_ext_control(codec);

+ 1 - 1
sound/soc/pxa/poodle.c

@@ -77,7 +77,7 @@ static void poodle_ext_control(struct snd_soc_codec *codec)
 static int poodle_startup(struct snd_pcm_substream *substream)
 static int poodle_startup(struct snd_pcm_substream *substream)
 {
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_codec *codec = rtd->socdev->codec;
+	struct snd_soc_codec *codec = rtd->socdev->card->codec;
 
 
 	/* check the jack status at stream startup */
 	/* check the jack status at stream startup */
 	poodle_ext_control(codec);
 	poodle_ext_control(codec);

+ 1 - 1
sound/soc/pxa/spitz.c

@@ -109,7 +109,7 @@ static void spitz_ext_control(struct snd_soc_codec *codec)
 static int spitz_startup(struct snd_pcm_substream *substream)
 static int spitz_startup(struct snd_pcm_substream *substream)
 {
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_codec *codec = rtd->socdev->codec;
+	struct snd_soc_codec *codec = rtd->socdev->card->codec;
 
 
 	/* check the jack status at stream startup */
 	/* check the jack status at stream startup */
 	spitz_ext_control(codec);
 	spitz_ext_control(codec);

+ 1 - 1
sound/soc/pxa/tosa.c

@@ -82,7 +82,7 @@ static void tosa_ext_control(struct snd_soc_codec *codec)
 static int tosa_startup(struct snd_pcm_substream *substream)
 static int tosa_startup(struct snd_pcm_substream *substream)
 {
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_codec *codec = rtd->socdev->codec;
+	struct snd_soc_codec *codec = rtd->socdev->card->codec;
 
 
 	/* check the jack status at stream startup */
 	/* check the jack status at stream startup */
 	tosa_ext_control(codec);
 	tosa_ext_control(codec);