From: Takashi Iwai Date: Wed, 5 Mar 2014 10:52:24 +0000 (+0100) Subject: ALSA: hda - Add missing loopback merge path for AD1884/1984 codecs X-Git-Tag: v3.13.7~99 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cf3524adc82270715bb8ef1fa628c92f747f284;p=thirdparty%2Fkernel%2Fstable.git ALSA: hda - Add missing loopback merge path for AD1884/1984 codecs 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index df39c04deba94..20c32d373a328 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -1091,6 +1091,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);