mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-14 21:01:29 +00:00
[ALSA] hda-codec - Fix handling of capture controls on ALC882 3/6-stack models
Fixed the handling of capture controls on ALC882 3/6-stack models. Now the driver checks the availability of NID 07h. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
ed7cbe3e41
commit
0defb2672d
@ -4099,21 +4099,6 @@ static struct snd_kcontrol_new alc882_base_mixer[] = {
|
||||
HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT),
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
/* .name = "Capture Source", */
|
||||
.name = "Input Source",
|
||||
.count = 3,
|
||||
.info = alc882_mux_enum_info,
|
||||
.get = alc882_mux_enum_get,
|
||||
.put = alc882_mux_enum_put,
|
||||
},
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
@ -4347,8 +4332,6 @@ static struct alc_config_preset alc882_presets[] = {
|
||||
.num_dacs = ARRAY_SIZE(alc882_dac_nids),
|
||||
.dac_nids = alc882_dac_nids,
|
||||
.dig_out_nid = ALC882_DIGOUT_NID,
|
||||
.num_adc_nids = ARRAY_SIZE(alc882_adc_nids),
|
||||
.adc_nids = alc882_adc_nids,
|
||||
.dig_in_nid = ALC882_DIGIN_NID,
|
||||
.num_channel_mode = ARRAY_SIZE(alc882_ch_modes),
|
||||
.channel_mode = alc882_ch_modes,
|
||||
@ -4360,8 +4343,6 @@ static struct alc_config_preset alc882_presets[] = {
|
||||
.num_dacs = ARRAY_SIZE(alc882_dac_nids),
|
||||
.dac_nids = alc882_dac_nids,
|
||||
.dig_out_nid = ALC882_DIGOUT_NID,
|
||||
.num_adc_nids = ARRAY_SIZE(alc882_adc_nids),
|
||||
.adc_nids = alc882_adc_nids,
|
||||
.dig_in_nid = ALC882_DIGIN_NID,
|
||||
.num_channel_mode = ARRAY_SIZE(alc882_sixstack_modes),
|
||||
.channel_mode = alc882_sixstack_modes,
|
||||
|
Loading…
Reference in New Issue
Block a user