---

yaml --- r: 284229 b: refs/heads/master c: 4808d12 h: refs/heads/master i: 284227: 1211cfe v: v3
git-mirror · Jan 10, 2012 · c5a6a39 · c5a6a39
1 parent 01e5f5b
commit c5a6a39
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a90274de3548ebb2aabfbf488cea8e275a73dc6
+refs/heads/master: 4808d12d1dddb046ec86425e5f6766f02e950292
diff --git a/trunk/sound/pci/hda/patch_via.c b/trunk/sound/pci/hda/patch_via.c
@@ -2208,7 +2208,10 @@ static int via_auto_create_loopback_switch(struct hda_codec *codec)
 {
 	struct via_spec *spec = codec->spec;
 
-	if (!spec->aa_mix_nid || !spec->out_mix_path.depth)
+	if (!spec->aa_mix_nid)
+		return 0; /* no loopback switching available */
+	if (!(spec->out_mix_path.depth || spec->hp_mix_path.depth ||
+	      spec->speaker_path.depth))
 		return 0; /* no loopback switching available */
 	if (!via_clone_control(spec, &via_aamix_ctl_enum))
 		return -ENOMEM;