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

Commit 2a8d5391 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Fix the wrong adc_idx for capture source 



The patch "ALSA: hda - fix wrong adc_idx in generic parser" fixed the
adc_idx for the capture volume and capture switch controls.  But also
modified the adc_idx retrieval for the capture source controls
wrongly.  As multiple capture source controls are created in a single
shot with counts > 1, the id.index doesn't contain the real value.
The real index has to be taken via snd_ctl_get_ioffidx() as in the
original code.

This patch reverts the fixes partially to recover from the
regression.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 3f25dcf6

sound/pci/hda/hda_generic.c

+3 −2
Original line number Diff line number Diff line
@@ -2675,7 +2675,8 @@ static int mux_enum_get(struct snd_kcontrol *kcontrol, 
{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	struct hda_gen_spec *spec = codec->spec;

	unsigned int adc_idx = kcontrol->id.index;

	/* the ctls are created at once with multiple counts */

	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);



	ucontrol->value.enumerated.item[0] = spec->cur_mux[adc_idx];

	return 0;
@@ -2685,7 +2686,7 @@ static int mux_enum_put(struct snd_kcontrol *kcontrol, 
			    struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	unsigned int adc_idx = kcontrol->id.index;

	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);

	return mux_select(codec, adc_idx,

			  ucontrol->value.enumerated.item[0]);

}