diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-30 11:35:43 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-30 11:35:43 +0000 |
| commit | dfa7c70b04bb20df7936018c737014655bf92d09 (patch) | |
| tree | f5eb47ca770d70fe2d55006bc1a4e552b964c422 /sound/soc/s6000/s6105-ipcam.c | |
| parent | 551102762ebe8bc0aa867d28960d9be97bbe17c1 (diff) | |
| parent | b76fb39d49f67a484a6adc8f041d9ad833f6860e (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
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 2e977e4d65e..bf3f3f9165e 100644 --- a/sound/soc/s6000/s6105-ipcam.c +++ b/sound/soc/s6000/s6105-ipcam.c @@ -168,7 +168,7 @@ static int s6105_aic3x_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dapm_sync(dapm); - 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; } |