summaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa/tosa.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-11 08:28:04 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-11 08:28:04 +0100
commit9e30d7718bb7402c7bdee631ad2aae2658c324f0 (patch)
tree51b898f8106fea24278e8313b64fc954a99729b5 /sound/soc/pxa/tosa.c
parentMerge branch 'for-2.6.29' into for-2.6.30 (diff)
downloadlinux-9e30d7718bb7402c7bdee631ad2aae2658c324f0.tar.xz
linux-9e30d7718bb7402c7bdee631ad2aae2658c324f0.zip
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>
Diffstat (limited to 'sound/soc/pxa/tosa.c')
-rw-r--r--sound/soc/pxa/tosa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index c77194f74c9b..09b5bada03b9 100644
--- a/sound/soc/pxa/tosa.c
+++ b/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)
{
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);