aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-04-19 09:15:25 -0400
committerTakashi Iwai <tiwai@suse.de>2012-04-19 09:15:25 -0400
commitca3649de026ff95c6f2847e8d096cf2f411c02b3 (patch)
tree86bea3f1897ea8860dc80275bf1a2942d68eab12 /sound/pci
parentc16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff)
ALSA: hda/conexant - Don't set HP pin-control bit unconditionally
Some output pins on Conexant chips have no HP control bit, but the auto-parser initializes these pins unconditionally with PIN_HP. Check the pin-capability and avoid the HP bit if not supported. Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_conexant.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index d29d6d37790..f52c9ef3cc8 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -3951,9 +3951,14 @@ static void cx_auto_init_output(struct hda_codec *codec)
3951 int i; 3951 int i;
3952 3952
3953 mute_outputs(codec, spec->multiout.num_dacs, spec->multiout.dac_nids); 3953 mute_outputs(codec, spec->multiout.num_dacs, spec->multiout.dac_nids);
3954 for (i = 0; i < cfg->hp_outs; i++) 3954 for (i = 0; i < cfg->hp_outs; i++) {
3955 unsigned int val = PIN_OUT;
3956 if (snd_hda_query_pin_caps(codec, cfg->hp_pins[i]) &
3957 AC_PINCAP_HP_DRV)
3958 val |= AC_PINCTL_HP_EN;
3955 snd_hda_codec_write(codec, cfg->hp_pins[i], 0, 3959 snd_hda_codec_write(codec, cfg->hp_pins[i], 0,
3956 AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP); 3960 AC_VERB_SET_PIN_WIDGET_CONTROL, val);
3961 }
3957 mute_outputs(codec, cfg->hp_outs, cfg->hp_pins); 3962 mute_outputs(codec, cfg->hp_outs, cfg->hp_pins);
3958 mute_outputs(codec, cfg->line_outs, cfg->line_out_pins); 3963 mute_outputs(codec, cfg->line_outs, cfg->line_out_pins);
3959 mute_outputs(codec, cfg->speaker_outs, cfg->speaker_pins); 3964 mute_outputs(codec, cfg->speaker_outs, cfg->speaker_pins);