diff options
| author |   Lydia Wang <lydiawang@viatech.com.cn> | 2009-10-10 19:08:19 +0800 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2009-10-11 17:57:33 +0200 |
| commit | 82ef9e45c48634af5e3f6ab9ac75b6642c538020 (patch) | |
| tree | db0ae4a583ee0d2a5d8a1ef62165159f52804d70 /sound/pci/hda/patch_via.c | |
| parent | ALSA: HDA VIA: Add Jack detect feature for VT1708. (diff) | |
| download | linux-dev-82ef9e45c48634af5e3f6ab9ac75b6642c538020.tar.xz linux-dev-82ef9e45c48634af5e3f6ab9ac75b6642c538020.zip | |
ALSA: HDA VIA: Modify vt1708_set_pinconfig_connect function.
like seqassoc 0xff, seqassoc 0xf0 of vt1708 should override Port
Connectivity field into 'AC_JACK_PORT_COMPLEX'
Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: Logan Li <loganli@viatech.com.cn>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_via.c')
| -rw-r--r-- | sound/pci/hda/patch_via.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 38418a53acd7..dc416ec0c6d4 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c @@ -1768,11 +1768,10 @@ static void vt1708_set_pinconfig_connect(struct hda_codec *codec, hda_nid_t nid) def_conf = snd_hda_codec_get_pincfg(codec, nid); seqassoc = (unsigned char) get_defcfg_association(def_conf); seqassoc = (seqassoc << 4) | get_defcfg_sequence(def_conf); - if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE) { - if (seqassoc == 0xff) { - def_conf = def_conf & (~(AC_JACK_PORT_BOTH << 30)); - snd_hda_codec_set_pincfg(codec, nid, def_conf); - } + if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE + && (seqassoc == 0xf0 || seqassoc == 0xff)) { + def_conf = def_conf & (~(AC_JACK_PORT_BOTH << 30)); + snd_hda_codec_set_pincfg(codec, nid, def_conf); } return; |