Commit 9e30d771 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
parent 9e32ebdb

sound/soc/omap/n810.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int n810_startup(struct snd_pcm_substream *substream) 
{

	struct snd_pcm_runtime *runtime = substream->runtime;

	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,

				     SNDRV_PCM_HW_PARAM_CHANNELS, 2, 2);

sound/soc/pxa/corgi.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static void corgi_ext_control(struct snd_soc_codec *codec) 
static int corgi_startup(struct snd_pcm_substream *substream)

{

	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 */

	corgi_ext_control(codec);

sound/soc/pxa/palm27x.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static void palm27x_ext_control(struct snd_soc_codec *codec) 
static int palm27x_startup(struct snd_pcm_substream *substream)

{

	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 */

	palm27x_ext_control(codec);

sound/soc/pxa/poodle.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static void poodle_ext_control(struct snd_soc_codec *codec) 
static int poodle_startup(struct snd_pcm_substream *substream)

{

	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 */

	poodle_ext_control(codec);

sound/soc/pxa/spitz.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static void spitz_ext_control(struct snd_soc_codec *codec) 
static int spitz_startup(struct snd_pcm_substream *substream)

{

	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 */

	spitz_ext_control(codec);

CRA Git | Maintained and supported by SUSTech CRA and CCSE