projects / sdk / emulator / emulator-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2bd9aef)
ALSA: hda - Add missing loopback merge path for AD1884/1984 codecs
authorTakashi Iwai <tiwai@suse.de>
Wed, 5 Mar 2014 10:52:24 +0000 (11:52 +0100)
committerJiri Slaby <jslaby@suse.cz>
Sat, 22 Mar 2014 21:01:52 +0000 (22:01 +0100)
commit c5eda4c1bf6214332c46fb2f4e7c42a85e5e5643 upstream.

The mixer widget (NID 0x20) of AD1884 and AD1984 codecs isn't
connected directly to the actual I/O paths but only via another mixer
widget (NID 0x21).  We need a similar fix as we did for AD1882.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
sound/pci/hda/patch_analog.c patch | blob | history

diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 7fc15814c61822e46af41a0894e306f60982be44..41ebdd8812b113852c9bec4c2f5511377b7fc173 100644 (file)
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -1085,6 +1085,7 @@ static int patch_ad1884(struct hda_codec *codec)
        spec = codec->spec;
 
        spec->gen.mixer_nid = 0x20;
+       spec->gen.mixer_merge_nid = 0x21;
        spec->gen.beep_nid = 0x10;
        set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
 
Domain: SDK / Emulator;