projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
338c7ed
)
[ALSA] ASoC: Fix WM9712 mixer_event DAPM widget function type
author
Jarkko Nikula
<jarkko.nikula@nokia.com>
Thu, 28 Feb 2008 11:35:25 +0000
(12:35 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Fri, 29 Feb 2008 10:28:18 +0000
(11:28 +0100)
Add kcontrol argument to function since the API was changed by the commit
9af6d9562414568ecadf96aaef5b88e7e8b19821
.
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/soc/codecs/wm9712.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/wm9712.c
b/sound/soc/codecs/wm9712.c
index
590baea
..
524f745
100644
(file)
--- a/
sound/soc/codecs/wm9712.c
+++ b/
sound/soc/codecs/wm9712.c
@@
-176,7
+176,8
@@
static int wm9712_add_controls(struct snd_soc_codec *codec)
* the codec only has a single control that is shared by both channels.
* This makes it impossible to determine the audio path.
*/
-static int mixer_event (struct snd_soc_dapm_widget *w, int event)
+static int mixer_event(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *k, int event)
{
u16 l, r, beep, line, phone, mic, pcm, aux;