Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac06e229 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'test/hda-gen-parser' into test/hda-migrate 

* test/hda-gen-parser:
  ALSA: hda - Add capture_switch_hook to generic parser
parents b3f6008f ae177c3f

sound/pci/hda/hda_generic.c

+15 −1
Original line number Diff line number Diff line
@@ -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 = {

sound/pci/hda/hda_generic.h

+3 −0
Original line number Diff line number Diff line
@@ -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);