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

Commit 1e11cae1 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Fix the check of loopback-mixer element index in patch_via.c 



Fix the check of the multiple loopback-mixer, which gave sometimes
a wrong index assigned to an element even for different names, e.g.
Mic and Front Mic.  Now check the label properly for avoid duplication.

Reported-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 0f98c24b

sound/pci/hda/patch_via.c

+4 −2
Original line number Diff line number Diff line
@@ -1875,6 +1875,7 @@ static int via_auto_create_analog_input_ctls(struct hda_codec *codec, 
	struct via_spec *spec = codec->spec;

	struct hda_input_mux *imux = &spec->private_imux[0];

	int i, j, err, idx, idx2, type, type_idx = 0;

	const char *prev_label = NULL;

	hda_nid_t cap_nid;

	hda_nid_t pin_idxs[8];

	int num_idxs;
@@ -1908,11 +1909,12 @@ static int via_auto_create_analog_input_ctls(struct hda_codec *codec, 
				break;

		if (idx >= num_idxs)

			continue;

		if (i > 0 && type == cfg->inputs[i - 1].type)

		label = hda_get_autocfg_input_label(codec, cfg, i);

		if (prev_label && !strcmp(label, prev_label))

			type_idx++;

		else

			type_idx = 0;

		label = hda_get_autocfg_input_label(codec, cfg, i);

		prev_label = label;

		idx2 = get_connection_index(codec, spec->aa_mix_nid,

					    pin_idxs[idx]);

		if (idx2 >= 0) {