diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-02 11:33:53 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-02 11:33:53 -0500 |
| commit | 2ff38c9fbaa86264ad819117ab137361067ab5f1 (patch) | |
| tree | 154e163934796d5c82afdf0633ce3d197f6bb1f4 /sound/soc/s6000/s6105-ipcam.c | |
| parent | c949e3d685b661412bfcd93d9c5956f125c1e060 (diff) | |
| parent | af745bd724e304cc94a88a2fb43d53baffbd63a5 (diff) | |
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) | |||
| 167 | 167 | ||
| 168 | snd_soc_dapm_sync(codec); | 168 | snd_soc_dapm_sync(codec); |
| 169 | 169 | ||
| 170 | snd_ctl_add(codec->snd_card, snd_ctl_new1(&audio_out_mux, codec)); | 170 | snd_ctl_add(codec->card->snd_card, snd_ctl_new1(&audio_out_mux, codec)); |
| 171 | 171 | ||
| 172 | return 0; | 172 | return 0; |
| 173 | } | 173 | } |