diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 12:48:35 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 12:50:25 +0100 |
| commit | fbb5bb563925db138a8bbfa6a0ea0e089fbd2405 (patch) | |
| tree | 5b076035fa8cb6e88c673575e4f4d77f0c27a2f0 /sound/pci | |
| parent | 6be7948ff4fa7662c1ee1994e1798074f8e832ed (diff) | |
| download | linux-stable-fbb5bb563925db138a8bbfa6a0ea0e089fbd2405.tar.gz linux-stable-fbb5bb563925db138a8bbfa6a0ea0e089fbd2405.tar.bz2 linux-stable-fbb5bb563925db138a8bbfa6a0ea0e089fbd2405.zip | |
ALSA: hda - Mute speakers when line-out jack is plugged with Conexant auto mode
Mute speakers when a line-out jack is plugged as well as headphone jacks
with the new Conexant codec parser in the auto mode.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 46bbf14e91ae..96b286aebde6 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -3424,6 +3424,9 @@ static void cx_auto_hp_automute(struct hda_codec *codec) AC_VERB_SET_PIN_WIDGET_CONTROL, present ? 0 : PIN_OUT); } + for (i = 0; !present && i < cfg->line_outs; i++) + if (snd_hda_jack_detect(codec, cfg->line_out_pins[i])) + present = 1; for (i = 0; i < cfg->speaker_outs; i++) { snd_hda_codec_write(codec, cfg->speaker_pins[i], 0, AC_VERB_SET_PIN_WIDGET_CONTROL, |