aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/s6000/s6105-ipcam.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-03 09:20:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-03 09:20:41 -0800
commit9cd6315357eccb768d9062cb43e3dc741e922020 (patch)
tree0381d3684848f9529c7dcf8477c0d1cf30d5e1f3 /sound/soc/s6000/s6105-ipcam.c
parent88063dd69b124721e18a59535d4f35266fcb867f (diff)
parent2ff38c9fbaa86264ad819117ab137361067ab5f1 (diff)
downloadmrst-s0i3-test-9cd6315357eccb768d9062cb43e3dc741e922020.tar.gz
mrst-s0i3-test-9cd6315357eccb768d9062cb43e3dc741e922020.tar.xz
mrst-s0i3-test-9cd6315357eccb768d9062cb43e3dc741e922020.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ASoC: omap: N810: Don't select CONFIG_OMAP_MUX but make it as dependency ALSA: hda: Use "alienware" model quirk for another SSID ASoC: WM8731: Fix incorrect mask for bypass path disable s6105-ipcam: fix compilation s6000-pcm: fix compilation s6000-i2s: fix compilation ASoC: Fix missing spin_unlock_irqrestore ALSA: Fix SNDCTL_DSP_RESET ioctl for OSS emulation ASoC: Add missing dev_set_drvdata in p1022_ds_probe ASoC: Add missing dev_set_drvdata in mpc8610_hpcd_probe ASoC: Remove unneeded !! operations while checking return value of nuc900_checkready ASoC: Fix compile error for nuc900-pcm.c ASoC: Fix prototype for nuc900_ac97_probe and nuc900_ac97_remove ASoC: Fix compile error for nuc900-ac97.c ALSA: hda: Use BIOS auto-parsing instead of existing model quirk for MEDION MD2
Diffstat (limited to 'sound/soc/s6000/s6105-ipcam.c')
-rw-r--r--sound/soc/s6000/s6105-ipcam.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c
index 96c05e13753..c1244c5bc73 100644
--- a/sound/soc/s6000/s6105-ipcam.c
+++ b/sound/soc/s6000/s6105-ipcam.c
@@ -167,7 +167,7 @@ static int s6105_aic3x_init(struct snd_soc_pcm_runtime *rtd)
snd_soc_dapm_sync(codec);
- snd_ctl_add(codec->snd_card, snd_ctl_new1(&audio_out_mux, codec));
+ snd_ctl_add(codec->card->snd_card, snd_ctl_new1(&audio_out_mux, codec));
return 0;
}