projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.37' into for-2.6.38
[cascardo/linux.git]
/
sound
/
soc
/
s6000
/
s6105-ipcam.c
diff --git
a/sound/soc/s6000/s6105-ipcam.c
b/sound/soc/s6000/s6105-ipcam.c
index
2e977e4
..
bf3f3f9
100644
(file)
--- 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;
}