Skip to content

Commit

Permalink
ASoC: Fix forgotten replacements of socdev->codec
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai committed Feb 11, 2009
1 parent 9e32ebd commit 9e30d77
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion sound/soc/omap/n810.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/pxa/corgi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/pxa/palm27x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/pxa/poodle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/pxa/spitz.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/pxa/tosa.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static void tosa_ext_control(struct snd_soc_codec *codec)
static int tosa_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 */
tosa_ext_control(codec);
Expand Down

0 comments on commit 9e30d77

Please sign in to comment.