From: Lydia Wang <lydiawang@viatech.com.cn>
Date: Tue, 22 Mar 2011 08:26:36 +0000 (+0800)
Subject: ALSA: hda - VIA: Fix VT1708 can't build up Headphone control issue
X-Git-Tag: v2.6.38.2~57
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ab0190c746a2d9f830c9f25507d78b4e19c5f219;p=users%2Fdwmw2%2Flinux.git

ALSA: hda - VIA: Fix VT1708 can't build up Headphone control issue

commit ee3c35c0827de02de414d08b2ddcbb910c2263ab upstream.

Since VT1708 didn't support the control of getting connection number,
building of headphone control will fail in via_hp_build() function.

Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 269bb365752b4..acc45798eeb43 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -1266,9 +1266,12 @@ static int via_hp_build(struct hda_codec *codec)
 		break;
 	}
 
-	nums = snd_hda_get_connections(codec, nid, conn, HDA_MAX_CONNECTIONS);
-	if (nums <= 1)
-		return 0;
+	if (spec->codec_type != VT1708) {
+		nums = snd_hda_get_connections(codec, nid,
+					       conn, HDA_MAX_CONNECTIONS);
+		if (nums <= 1)
+			return 0;
+	}
 
 	knew = via_clone_control(spec, &via_hp_mixer[0]);
 	if (knew == NULL)