Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALSA: hda/realtek - Fix DAC assignments of multiple speakers

Browse source 
When a device has multiple speakers and still has the auto-mute support,
the driver copies line_outs[] to speaker_outs[].  And then it tries to
assign DACs for both.  This ended up with the assignment only to the
primary DAC to all speakers.

This patch fixes the situation by checking the duplicated LO/SPK case
appropriately.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2011-10-21 15:07:42 +02:00
parent c146623884
commit 716eef032c
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sound/pci/hda/patch_realtek.c
View file

@ -2996,9 +2996,11 @@ static int alc_auto_fill_dac_nids(struct hda_codec *codec)
}
}
alc_auto_fill_extra_dacs(codec, cfg->hp_outs, cfg->hp_pins,
if (cfg->line_out_type != AUTO_PIN_HP_OUT)
alc_auto_fill_extra_dacs(codec, cfg->hp_outs, cfg->hp_pins,
spec->multiout.hp_out_nid);
alc_auto_fill_extra_dacs(codec, cfg->speaker_outs, cfg->speaker_pins,
if (cfg->line_out_type != AUTO_PIN_SPEAKER_OUT)
alc_auto_fill_extra_dacs(codec, cfg->speaker_outs, cfg->speaker_pins,
spec->multiout.extra_out_nid);
return 0;
@ -3315,6 +3317,8 @@ static void alc_auto_init_extra_out(struct hda_codec *codec)
hda_nid_t pin, dac;
for (i = 0; i < spec->autocfg.hp_outs; i++) {
if (spec->autocfg.line_out_type == AUTO_PIN_HP_OUT)
break;
pin = spec->autocfg.hp_pins[i];
if (!pin)
break;
@ -3328,6 +3332,8 @@ static void alc_auto_init_extra_out(struct hda_codec *codec)
alc_auto_set_output_and_unmute(codec, pin, PIN_HP, dac);
}
for (i = 0; i < spec->autocfg.speaker_outs; i++) {
if (spec->autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT)
break;
pin = spec->autocfg.speaker_pins[i];
if (!pin)
break;