瀏覽代碼

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>
Takashi Iwai 14 年之前
父節點
當前提交
fbb5bb5639
共有 1 個文件被更改,包括 3 次插入0 次删除
  1. 3 0
      sound/pci/hda/patch_conexant.c

+ 3 - 0
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,
 				    AC_VERB_SET_PIN_WIDGET_CONTROL,
 				    present ? 0 : PIN_OUT);
 				    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++) {
 	for (i = 0; i < cfg->speaker_outs; i++) {
 		snd_hda_codec_write(codec, cfg->speaker_pins[i], 0,
 		snd_hda_codec_write(codec, cfg->speaker_pins[i], 0,
 				    AC_VERB_SET_PIN_WIDGET_CONTROL,
 				    AC_VERB_SET_PIN_WIDGET_CONTROL,