From ae177c3fd0667df21b60bc8e031607de257e58e4 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 14 Jan 2013 12:13:06 +0100 Subject: [PATCH] ALSA: hda - Add capture_switch_hook to generic parser Add a hook for the capture mixer switch. This will be used by IDT codecs for controlling the mic-mute LED. Signed-off-by: Takashi Iwai --- sound/pci/hda/hda_generic.c | 16 +++++++++++++++- sound/pci/hda/hda_generic.h | 3 +++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 4bc4cd933866..932e6a133f3d 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -2517,9 +2517,23 @@ static const struct snd_kcontrol_new cap_vol_temp = { static int cap_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - return cap_put_caller(kcontrol, ucontrol, + struct hda_codec *codec = snd_kcontrol_chip(kcontrol); + struct hda_gen_spec *spec = codec->spec; + int ret; + + ret = cap_put_caller(kcontrol, ucontrol, snd_hda_mixer_amp_switch_put, NID_PATH_MUTE_CTL); + if (ret < 0) + return ret; + + if (spec->capture_switch_hook) { + bool enable = (ucontrol->value.integer.value[0] || + ucontrol->value.integer.value[1]); + spec->capture_switch_hook(codec, enable); + } + + return ret; } static const struct snd_kcontrol_new cap_sw_temp = { diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index bfa2d973268b..1ceaacd1b775 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -227,6 +227,9 @@ struct hda_gen_spec { struct hda_jack_tbl *tbl); void (*mic_autoswitch_hook)(struct hda_codec *codec, struct hda_jack_tbl *tbl); + + /* capture switch hook (for mic-mute LED) */ + void (*capture_switch_hook)(struct hda_codec *codec, bool enable); }; int snd_hda_gen_spec_init(struct hda_gen_spec *spec);