Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jarkko Nikula <jarkko.nikula@nokia.com>
To: alsa-devel@alsa-project.org
Cc: Jarkko Nikula <jarkko.nikula@nokia.com>
Subject: [PATCH 2/2] ASoC: Fix WM9712 mixer_event DAPM widget function type
Date: Thu, 28 Feb 2008 11:53:10 +0200	[thread overview]
Message-ID: <1204192390-16304-3-git-send-email-jarkko.nikula@nokia.com> (raw)
In-Reply-To: <1204192390-16304-1-git-send-email-jarkko.nikula@nokia.com>

Add kcontrol argument to function since the API was changed by the commit
9af6d9562414568ecadf96aaef5b88e7e8b19821.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
---
 sound/soc/codecs/wm9712.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 590baea..524f745 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;
 
-- 
1.5.3.8

  parent reply	other threads:[~2008-02-28  9:53 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-28  9:53 [PATCH 0/2] Fixes to couple DAPM widget functions Jarkko Nikula
2008-02-28  9:53 ` [PATCH 1/2] ASoC: Fix DAPM widget function types in pxa machine drivers Jarkko Nikula
2008-02-28  9:53 ` Jarkko Nikula [this message]
2008-02-28 11:38 ` [PATCH 0/2] Fixes to couple DAPM widget functions Takashi Iwai
2008-02-28 12:29 ` Mark Brown
2008-02-28 13:29   ` Jarkko Nikula
2008-02-28 13:48     ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1204192390-16304-3-git-send-email-jarkko.nikula@nokia.com \
    --to=jarkko.nikula@nokia.com \
    --cc=alsa-devel@alsa-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox