Commit c503ad46 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Fix duplicated capture-volume creation for ALC268 models

Fix the duplicated creation of capture-mixer elements for some static
ALC268 configurations.  The capture mixers must be put to cap_mixer field
instead of mixers array.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent eade7b28
...@@ -476,8 +476,8 @@ static const struct snd_pci_quirk alc268_ssid_cfg_tbl[] = { ...@@ -476,8 +476,8 @@ static const struct snd_pci_quirk alc268_ssid_cfg_tbl[] = {
static const struct alc_config_preset alc268_presets[] = { static const struct alc_config_preset alc268_presets[] = {
[ALC267_QUANTA_IL1] = { [ALC267_QUANTA_IL1] = {
.mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer, .mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer },
alc268_capture_nosrc_mixer }, .cap_mixer = alc268_capture_nosrc_mixer,
.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs, .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
alc267_quanta_il1_verbs }, alc267_quanta_il1_verbs },
.num_dacs = ARRAY_SIZE(alc268_dac_nids), .num_dacs = ARRAY_SIZE(alc268_dac_nids),
...@@ -492,8 +492,8 @@ static const struct alc_config_preset alc268_presets[] = { ...@@ -492,8 +492,8 @@ static const struct alc_config_preset alc268_presets[] = {
.init_hook = alc_inithook, .init_hook = alc_inithook,
}, },
[ALC268_3ST] = { [ALC268_3ST] = {
.mixers = { alc268_base_mixer, alc268_capture_alt_mixer, .mixers = { alc268_base_mixer, alc268_beep_mixer },
alc268_beep_mixer }, .cap_mixer = alc268_capture_alt_mixer,
.init_verbs = { alc268_base_init_verbs }, .init_verbs = { alc268_base_init_verbs },
.num_dacs = ARRAY_SIZE(alc268_dac_nids), .num_dacs = ARRAY_SIZE(alc268_dac_nids),
.dac_nids = alc268_dac_nids, .dac_nids = alc268_dac_nids,
...@@ -507,8 +507,8 @@ static const struct alc_config_preset alc268_presets[] = { ...@@ -507,8 +507,8 @@ static const struct alc_config_preset alc268_presets[] = {
.input_mux = &alc268_capture_source, .input_mux = &alc268_capture_source,
}, },
[ALC268_TOSHIBA] = { [ALC268_TOSHIBA] = {
.mixers = { alc268_toshiba_mixer, alc268_capture_alt_mixer, .mixers = { alc268_toshiba_mixer, alc268_beep_mixer },
alc268_beep_mixer }, .cap_mixer = alc268_capture_alt_mixer,
.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs, .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
alc268_toshiba_verbs }, alc268_toshiba_verbs },
.num_dacs = ARRAY_SIZE(alc268_dac_nids), .num_dacs = ARRAY_SIZE(alc268_dac_nids),
...@@ -525,8 +525,8 @@ static const struct alc_config_preset alc268_presets[] = { ...@@ -525,8 +525,8 @@ static const struct alc_config_preset alc268_presets[] = {
.init_hook = alc_inithook, .init_hook = alc_inithook,
}, },
[ALC268_ACER] = { [ALC268_ACER] = {
.mixers = { alc268_acer_mixer, alc268_capture_alt_mixer, .mixers = { alc268_acer_mixer, alc268_beep_mixer },
alc268_beep_mixer }, .cap_mixer = alc268_capture_alt_mixer,
.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs, .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
alc268_acer_verbs }, alc268_acer_verbs },
.num_dacs = ARRAY_SIZE(alc268_dac_nids), .num_dacs = ARRAY_SIZE(alc268_dac_nids),
...@@ -543,8 +543,8 @@ static const struct alc_config_preset alc268_presets[] = { ...@@ -543,8 +543,8 @@ static const struct alc_config_preset alc268_presets[] = {
.init_hook = alc_inithook, .init_hook = alc_inithook,
}, },
[ALC268_ACER_DMIC] = { [ALC268_ACER_DMIC] = {
.mixers = { alc268_acer_dmic_mixer, alc268_capture_alt_mixer, .mixers = { alc268_acer_dmic_mixer, alc268_beep_mixer },
alc268_beep_mixer }, .cap_mixer = alc268_capture_alt_mixer,
.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs, .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
alc268_acer_verbs }, alc268_acer_verbs },
.num_dacs = ARRAY_SIZE(alc268_dac_nids), .num_dacs = ARRAY_SIZE(alc268_dac_nids),
...@@ -561,9 +561,8 @@ static const struct alc_config_preset alc268_presets[] = { ...@@ -561,9 +561,8 @@ static const struct alc_config_preset alc268_presets[] = {
.init_hook = alc_inithook, .init_hook = alc_inithook,
}, },
[ALC268_ACER_ASPIRE_ONE] = { [ALC268_ACER_ASPIRE_ONE] = {
.mixers = { alc268_acer_aspire_one_mixer, .mixers = { alc268_acer_aspire_one_mixer, alc268_beep_mixer},
alc268_beep_mixer, .cap_mixer = alc268_capture_nosrc_mixer,
alc268_capture_nosrc_mixer },
.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs, .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
alc268_acer_aspire_one_verbs }, alc268_acer_aspire_one_verbs },
.num_dacs = ARRAY_SIZE(alc268_dac_nids), .num_dacs = ARRAY_SIZE(alc268_dac_nids),
...@@ -579,8 +578,8 @@ static const struct alc_config_preset alc268_presets[] = { ...@@ -579,8 +578,8 @@ static const struct alc_config_preset alc268_presets[] = {
.init_hook = alc_inithook, .init_hook = alc_inithook,
}, },
[ALC268_DELL] = { [ALC268_DELL] = {
.mixers = { alc268_dell_mixer, alc268_beep_mixer, .mixers = { alc268_dell_mixer, alc268_beep_mixer},
alc268_capture_nosrc_mixer }, .cap_mixer = alc268_capture_nosrc_mixer,
.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs, .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
alc268_dell_verbs }, alc268_dell_verbs },
.num_dacs = ARRAY_SIZE(alc268_dac_nids), .num_dacs = ARRAY_SIZE(alc268_dac_nids),
...@@ -596,8 +595,8 @@ static const struct alc_config_preset alc268_presets[] = { ...@@ -596,8 +595,8 @@ static const struct alc_config_preset alc268_presets[] = {
.init_hook = alc_inithook, .init_hook = alc_inithook,
}, },
[ALC268_ZEPTO] = { [ALC268_ZEPTO] = {
.mixers = { alc268_base_mixer, alc268_capture_alt_mixer, .mixers = { alc268_base_mixer, alc268_beep_mixer },
alc268_beep_mixer }, .cap_mixer = alc268_capture_alt_mixer,
.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs, .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
alc268_toshiba_verbs }, alc268_toshiba_verbs },
.num_dacs = ARRAY_SIZE(alc268_dac_nids), .num_dacs = ARRAY_SIZE(alc268_dac_nids),
...@@ -616,7 +615,8 @@ static const struct alc_config_preset alc268_presets[] = { ...@@ -616,7 +615,8 @@ static const struct alc_config_preset alc268_presets[] = {
}, },
#ifdef CONFIG_SND_DEBUG #ifdef CONFIG_SND_DEBUG
[ALC268_TEST] = { [ALC268_TEST] = {
.mixers = { alc268_test_mixer, alc268_capture_mixer }, .mixers = { alc268_test_mixer },
.cap_mixer = alc268_capture_mixer,
.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs, .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
alc268_volume_init_verbs, alc268_volume_init_verbs,
alc268_beep_init_verbs }, alc268_beep_init_verbs },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment