---

yaml --- r: 86163 b: refs/heads/master c: 2f08554 h: refs/heads/master i: 86161: c53e87d 86159: f28458e v: v3
git-mirror · Feb 22, 2008 · 6772e01 · 6772e01
1 parent a51a85e
commit 6772e01
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14c65f98bfea9324cf334793305dd262d0095850
+refs/heads/master: 2f0855497738a56825ee6445574835b4fc1d77d5
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
@@ -1055,6 +1055,12 @@ int snd_hda_add_vmaster(struct hda_codec *codec, char *name,
 	const char **s;
 	int err;
 
+	for (s = slaves; *s && !snd_hda_find_mixer_ctl(codec, *s); s++)
+		;
+	if (!*s) {
+		snd_printdd("No slave found for %s\n", name);
+		return 0;
+	}
 	kctl = snd_ctl_make_virtual_master(name, tlv);
 	if (!kctl)
 		return -ENOMEM;