summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLydia Wang <lydiawang@viatech.com.cn>2011-03-22 16:26:36 +0800
committerTakashi Iwai <tiwai@suse.de>2011-03-22 12:56:06 +0100
commitee3c35c0827de02de414d08b2ddcbb910c2263ab (patch)
tree094e968887e76ffecbce9db8580714b78db2c2f2
parent970f630f5adcefb2841338929e209d970001d919 (diff)
downloadlinux-3.10-ee3c35c0827de02de414d08b2ddcbb910c2263ab.tar.gz
linux-3.10-ee3c35c0827de02de414d08b2ddcbb910c2263ab.tar.bz2
linux-3.10-ee3c35c0827de02de414d08b2ddcbb910c2263ab.zip
ALSA: hda - VIA: Fix VT1708 can't build up Headphone control issue
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> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_via.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 7e317f933a0..1371b57c11e 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)