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

Commit 8884be98 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into for-linus 

* fix/hda:
  ALSA: hda - Don't override ADC definitions for ALC codecs
  ALSA: hda - Add missing vmaster initialization for ALC269
parents 909a2607 dd704698

sound/pci/hda/patch_realtek.c

+14 −6
Original line number Original line Diff line number Diff line
@@ -13563,6 +13563,8 @@ static int patch_alc269(struct hda_codec *codec) 
		set_capture_mixer(spec);

		set_capture_mixer(spec);

	set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);

	set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);




















	spec->vmaster_nid = 0x02;
























	codec->patch_ops = alc_patch_ops;







	codec->patch_ops = alc_patch_ops;











	if (board_config == ALC269_AUTO)







	if (board_config == ALC269_AUTO)











		spec->init_hook = alc269_auto_init;







		spec->init_hook = alc269_auto_init;










@@ -15577,8 +15579,11 @@ static int patch_alc861vd(struct hda_codec *codec)









	spec->stream_digital_playback = &alc861vd_pcm_digital_playback;







	spec->stream_digital_playback = &alc861vd_pcm_digital_playback;











	spec->stream_digital_capture = &alc861vd_pcm_digital_capture;







	spec->stream_digital_capture = &alc861vd_pcm_digital_capture;






























	if (!spec->adc_nids) {











		spec->adc_nids = alc861vd_adc_nids;







		spec->adc_nids = alc861vd_adc_nids;











		spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids);







		spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids);














	}














	if (!spec->capsrc_nids)











		spec->capsrc_nids = alc861vd_capsrc_nids;







		spec->capsrc_nids = alc861vd_capsrc_nids;



























	set_capture_mixer(spec);







	set_capture_mixer(spec);










@@ -17496,8 +17501,11 @@ static int patch_alc662(struct hda_codec *codec)









	spec->stream_digital_playback = &alc662_pcm_digital_playback;







	spec->stream_digital_playback = &alc662_pcm_digital_playback;











	spec->stream_digital_capture = &alc662_pcm_digital_capture;







	spec->stream_digital_capture = &alc662_pcm_digital_capture;






























	if (!spec->adc_nids) {











		spec->adc_nids = alc662_adc_nids;







		spec->adc_nids = alc662_adc_nids;











		spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids);







		spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids);














	}














	if (!spec->capsrc_nids)











		spec->capsrc_nids = alc662_capsrc_nids;







		spec->capsrc_nids = alc662_capsrc_nids;



























	if (!spec->cap_mixer)







	if (!spec->cap_mixer)