summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-07-06 13:07:54 +0200
committerTakashi Iwai <tiwai@suse.de>2011-07-07 09:31:09 +0200
commitbb8bf4d40cb67dac12106746067994c38229de69 (patch)
treee9fba0dad2aa5e7ff8a6edd0227d6e0656100ae7 /sound
parentMerge branch 'fix/hda' into topic/hda (diff)
downloadlinux-bb8bf4d40cb67dac12106746067994c38229de69.tar.xz
linux-bb8bf4d40cb67dac12106746067994c38229de69.zip
ALSA: hda - Parse HP and speaker DACs even for multi connections for ALC662
In alc662_auto_fill_dac_nids(), the HP and speaker DACs aren't parsed when the corresponding pins aren't fixed with single DACs. Now check these DACs even for non-fixed pins. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 49f39699ea1b..3cd21040555a 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -18845,6 +18845,13 @@ static int alc662_auto_fill_dac_nids(struct hda_codec *codec)
sizeof(hda_nid_t) * (cfg->line_outs - i - 1));
}
+ if (cfg->hp_outs && !spec->multiout.hp_nid)
+ spec->multiout.hp_nid =
+ alc_auto_look_for_dac(codec, cfg->hp_pins[0]);
+ if (cfg->speaker_outs && !spec->multiout.extra_out_nid[0])
+ spec->multiout.extra_out_nid[0] =
+ alc_auto_look_for_dac(codec, cfg->speaker_pins[0]);
+
return 0;
}