Commit 7a411ee0 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Allow slave controls with non-zero indices 



Fix snd_hda_add_vmaster() to check the non-zero indices of slave controls.

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

sound/pci/hda/hda_codec.c

+13 −8
Original line number Diff line number Diff line
@@ -1552,15 +1552,20 @@ int snd_hda_add_vmaster(struct hda_codec *codec, char *name, 
	

	for (s = slaves; *s; s++) {

		struct snd_kcontrol *sctl;



		sctl = snd_hda_find_mixer_ctl(codec, *s);

		int i = 0;

		for (;;) {

			sctl = _snd_hda_find_mixer_ctl(codec, *s, i);

			if (!sctl) {

			snd_printdd("Cannot find slave %s, skipped\n", *s);

			continue;

				if (!i)

					snd_printdd("Cannot find slave %s, "

						    "skipped\n", *s);

				break;

			}

			err = snd_ctl_add_slave(kctl, sctl);

			if (err < 0)

				return err;

			i++;

		}

	}

	return 0;

}