From 6772e01b1c0337f82f8332c1054691dac2f80410 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 22 Feb 2008 18:43:50 +0100
Subject: [PATCH] --- yaml --- r: 86163 b: refs/heads/master c:
 2f0855497738a56825ee6445574835b4fc1d77d5 h: refs/heads/master i:   86161:
 c53e87d55fa09a0b757e0929c0d62a67d4ea12f9   86159:
 f28458ebf100b8cd4a471c595b6d19e750db8b9f v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_codec.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a1dab820f819..2444d5f1c111 100644
--- 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
index 5c6419ead015..37c413923db8 100644
--- 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;