diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-02 17:33:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-02 17:33:53 +0100 |
| commit | 2ff38c9fbaa86264ad819117ab137361067ab5f1 (patch) | |
| tree | 154e163934796d5c82afdf0633ce3d197f6bb1f4 /sound/soc/s6000/s6105-ipcam.c | |
| parent | Merge branch 'fix/hda' into for-linus (diff) | |
| parent | Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lr... (diff) | |
| download | linux-2ff38c9fbaa86264ad819117ab137361067ab5f1.tar.xz linux-2ff38c9fbaa86264ad819117ab137361067ab5f1.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/s6000/s6105-ipcam.c')
| -rw-r--r-- | sound/soc/s6000/s6105-ipcam.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c index 96c05e137538..c1244c5bc730 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; } |