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: Takashi Iwai <tiwai@suse.de>

1 files changed, 13 insertions, 8 deletions

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 04cb1251e3e7..1885e7649101 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -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);
-                if (!sctl) {
-                        snd_printdd("Cannot find slave %s, skipped\n", *s);
-                        continue;
+                int i = 0;
+                for (;;) {
+                        sctl = _snd_hda_find_mixer_ctl(codec, *s, i);
+                        if (!sctl) {
+                                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++;
                 }
-                err = snd_ctl_add_slave(kctl, sctl);
-                if (err < 0)
-                        return err;
         }
         return 0;
 }