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

Commit 569ed348 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Revert "ALSA: HDA: Create mixers on ALC887" 



This reverts commit 03b7a1ab.

This commit was mistakenly re-introduced.  While the change is harmless
(as ALC887 uses patch_alc888() now), we should get rid of any wrong code.

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

sound/pci/hda/patch_realtek.c

+2 −8
Original line number Diff line number Diff line
@@ -10930,9 +10930,6 @@ static int alc_auto_add_mic_boost(struct hda_codec *codec) 
	return 0;

}













static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,













					     const struct auto_pin_cfg *cfg);



























/* almost identical with ALC880 parser... */















static int alc882_parse_auto_config(struct hda_codec *codec)















{









@@ -10950,9 +10947,6 @@ static int alc882_parse_auto_config(struct hda_codec *codec)













	err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);















	if (err < 0)















		return err;













	if (codec->vendor_id == 0x10ec0887)













		err = alc861vd_auto_create_multi_out_ctls(spec, &spec->autocfg);













	else















	err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);















	if (err < 0)















		return err;










@@ -17134,7 +17128,7 @@ static void alc861vd_auto_init_analog_input(struct hda_codec *codec)













#define alc861vd_idx_to_mixer_switch(nid)	((nid) + 0x0c)





























/* add playback controls from the parsed DAC table */













/* Based on ALC880 version. But ALC861VD and ALC887 have separate,













/* Based on ALC880 version. But ALC861VD has separate,















 * different NIDs for mute/unmute switch and volume control */















static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,















					     const struct auto_pin_cfg *cfg)