From d7474e17d22cd1429f0288a2913557da75f9406b Mon Sep 17 00:00:00 2001
From: Lydia Wang <lydiawang@viatech.com.cn>
Date: Fri, 1 Jul 2011 10:55:07 +0800
Subject: [PATCH] --- yaml --- r: 257727 b: refs/heads/master c:
 e5e14681404ec27a422d635284bf564dabde3f81 h: refs/heads/master i:   257725:
 a025a490292a8d13a5ef168c4572a09781dc2fe6   257723:
 6613fedce5ecc3175ee5db8641061cb2226bf1c7   257719:
 ca1464546bdde0d7a0bb7e267146947f986ac4fb   257711:
 9d0af39c987bd2449650e7fd8e1b0c093691e69b   257695:
 a6446da954c9364974b684cf8c10167249145d2e   257663:
 3b9d91d4b8c1eb4ae7665cb573833485ca125517 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/patch_via.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0f51998a790c..c43d88b74304 100644
--- 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
index 5ef14dd7a568..bbbc4f4cbf1a 100644
--- 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);