Commit 0a3fabe3 authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai

ALSA: HDA: Realtek ALC88x: Do not over-initialize speakers and hp that are primary outputs

Do not initialize again the what has already been initialized as
multi outs, as this breaks surround speakers.
Tested-by: default avatarBartłomiej Żogała <nusch88@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7e59e097
...@@ -10773,6 +10773,7 @@ static void alc882_auto_init_hp_out(struct hda_codec *codec) ...@@ -10773,6 +10773,7 @@ static void alc882_auto_init_hp_out(struct hda_codec *codec)
hda_nid_t pin, dac; hda_nid_t pin, dac;
int i; int i;
if (spec->autocfg.line_out_type != AUTO_PIN_HP_OUT) {
for (i = 0; i < ARRAY_SIZE(spec->autocfg.hp_pins); i++) { for (i = 0; i < ARRAY_SIZE(spec->autocfg.hp_pins); i++) {
pin = spec->autocfg.hp_pins[i]; pin = spec->autocfg.hp_pins[i];
if (!pin) if (!pin)
...@@ -10782,6 +10783,9 @@ static void alc882_auto_init_hp_out(struct hda_codec *codec) ...@@ -10782,6 +10783,9 @@ static void alc882_auto_init_hp_out(struct hda_codec *codec)
dac = spec->multiout.dac_nids[0]; /* to front */ dac = spec->multiout.dac_nids[0]; /* to front */
alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, dac); alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, dac);
} }
}
if (spec->autocfg.line_out_type != AUTO_PIN_SPEAKER_OUT) {
for (i = 0; i < ARRAY_SIZE(spec->autocfg.speaker_pins); i++) { for (i = 0; i < ARRAY_SIZE(spec->autocfg.speaker_pins); i++) {
pin = spec->autocfg.speaker_pins[i]; pin = spec->autocfg.speaker_pins[i];
if (!pin) if (!pin)
...@@ -10791,6 +10795,7 @@ static void alc882_auto_init_hp_out(struct hda_codec *codec) ...@@ -10791,6 +10795,7 @@ static void alc882_auto_init_hp_out(struct hda_codec *codec)
dac = spec->multiout.dac_nids[0]; /* to front */ dac = spec->multiout.dac_nids[0]; /* to front */
alc882_auto_set_output_and_unmute(codec, pin, PIN_OUT, dac); alc882_auto_set_output_and_unmute(codec, pin, PIN_OUT, dac);
} }
}
} }
static void alc882_auto_init_analog_input(struct hda_codec *codec) static void alc882_auto_init_analog_input(struct hda_codec *codec)
......
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