Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1ca7b4e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Fix initialization of multiple output pins for ALC268/269 



When multiple pins are assigned to headphones or speakers, they haven't
been initialized properly.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f6837bbd

sound/pci/hda/patch_realtek.c

+14 −6
Original line number Diff line number Diff line
@@ -13484,8 +13484,10 @@ static void alc268_auto_set_output_and_unmute(struct hda_codec *codec, 
static void alc268_auto_init_multi_out(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;

	hda_nid_t nid = spec->autocfg.line_out_pins[0];

	if (nid) {

	int i;













	for (i = 0; i < spec->autocfg.line_outs; i++) {













		hda_nid_t nid = spec->autocfg.line_out_pins[i];















		int pin_type = get_pin_type(spec->autocfg.line_out_type);















		alc268_auto_set_output_and_unmute(codec, nid, pin_type);















	}









@@ -13495,14 +13497,20 @@ static void alc268_auto_init_hp_out(struct hda_codec *codec)













{















	struct alc_spec *spec = codec->spec;















	hda_nid_t pin;













	int i;



























	pin = spec->autocfg.hp_pins[0];













	if (pin)













	for (i = 0; i < spec->autocfg.hp_outs; i++) {













		pin = spec->autocfg.hp_pins[i];















		alc268_auto_set_output_and_unmute(codec, pin, PIN_HP);













	pin = spec->autocfg.speaker_pins[0];













	if (pin)













	}













	for (i = 0; i < spec->autocfg.speaker_outs; i++) {













		pin = spec->autocfg.speaker_pins[i];















		alc268_auto_set_output_and_unmute(codec, pin, PIN_OUT);















	}













	if (spec->autocfg.mono_out_pin)













		snd_hda_codec_write(codec, spec->autocfg.mono_out_pin, 0,













				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);













}





























static void alc268_auto_init_mono_speaker_out(struct hda_codec *codec)















{