summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@nokia.com>2008-02-28 12:35:25 +0100
committerTakashi Iwai <tiwai@suse.de>2008-02-29 11:28:18 +0100
commit3fffe871b93f957bea443e85f6b221c50bbf9f97 (patch)
tree3f5f447c26c29f6dffc13c80d897f4e56861d135 /sound/soc/codecs
parent[ALSA] ASoC: Fix DAPM widget function types in pxa machine drivers (diff)
downloadlinux-3fffe871b93f957bea443e85f6b221c50bbf9f97.tar.xz
linux-3fffe871b93f957bea443e85f6b221c50bbf9f97.zip
[ALSA] ASoC: Fix WM9712 mixer_event DAPM widget function type
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>
Diffstat (limited to '')
-rw-r--r--sound/soc/codecs/wm9712.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 590baea3c4c3..524f7450804f 100644
--- 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;