diff options
| author | Lydia Wang <lydiawang@viatech.com.cn> | 2011-03-22 16:22:37 +0800 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-22 12:42:56 +0100 |
| commit | ce0e5a9e81fbb153ee15ca60246c6722f07fc546 (patch) | |
| tree | 566192ff4a0280010e23c767f3d753db43c357aa /sound | |
| parent | bff5fbf50bd498c217994bd2d41a53ac3141185a (diff) | |
| download | kernel_samsung_smdk4412-ce0e5a9e81fbb153ee15ca60246c6722f07fc546.tar.gz kernel_samsung_smdk4412-ce0e5a9e81fbb153ee15ca60246c6722f07fc546.tar.bz2 kernel_samsung_smdk4412-ce0e5a9e81fbb153ee15ca60246c6722f07fc546.zip | |
ALSA: hda - VIA: Fix independent headphone no sound issue
Modify via_independent_hp_put() function to support VT1718S and VT1812
codecs, and fix independent headphone no sound issue.
Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_via.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 5bc9bd983e8..2f605e59395 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c @@ -1191,8 +1191,16 @@ static int via_independent_hp_put(struct snd_kcontrol *kcontrol, /* Get Independent Mode index of headphone pin widget */ spec->hp_independent_mode = spec->hp_independent_mode_index == pinsel ? 1 : 0; - snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, pinsel); + if (spec->codec_type == VT1718S) + snd_hda_codec_write(codec, nid, 0, + AC_VERB_SET_CONNECT_SEL, pinsel ? 2 : 0); + else + snd_hda_codec_write(codec, nid, 0, + AC_VERB_SET_CONNECT_SEL, pinsel); + if (spec->codec_type == VT1812) + snd_hda_codec_write(codec, 0x35, 0, + AC_VERB_SET_CONNECT_SEL, pinsel); if (spec->multiout.hp_nid && spec->multiout.hp_nid != spec->multiout.dac_nids[HDA_FRONT]) snd_hda_codec_setup_stream(codec, spec->multiout.hp_nid, @@ -1211,6 +1219,8 @@ static int via_independent_hp_put(struct snd_kcontrol *kcontrol, activate_ctl(codec, "Headphone Playback Switch", spec->hp_independent_mode); } + /* update jack power state */ + set_jack_power_state(codec); return 0; } |