---

yaml --- r: 257727 b: refs/heads/master c: e5e1468 h: refs/heads/master i: 257725: a025a49 257723: 6613fed 257719: ca14645 257711: 9d0af39 257695: a6446da 257663: 3b9d91d v: v3
git-mirror · Jul 1, 2011 · d7474e1 · d7474e1
1 parent d4d73d4
commit d7474e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 350434ee53f39adb5e73320be4c98010b87d3dbf
+refs/heads/master: e5e14681404ec27a422d635284bf564dabde3f81
diff --git a/trunk/sound/pci/hda/patch_via.c b/trunk/sound/pci/hda/patch_via.c
@@ -451,6 +451,9 @@ static void activate_output_path(struct hda_codec *codec, struct nid_path *path,
 		if (enable && path->multi[i])
 			snd_hda_codec_write(codec, dst, 0,
 					    AC_VERB_SET_CONNECT_SEL, idx);
+		if (get_wcaps_type(get_wcaps(codec, src)) == AC_WID_AUD_OUT &&
+		    get_wcaps_type(get_wcaps(codec, dst)) == AC_WID_AUD_MIX)
+			continue;
 		if (have_mute(codec, dst, HDA_INPUT)) {
 			int val = enable ? AMP_IN_UNMUTE(idx) :
 				AMP_IN_MUTE(idx);