diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-05 11:52:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-23 21:38:14 -0700 |
| commit | 6f06330c7a0464591a4d43532654dbaf5dd509d1 (patch) | |
| tree | fa9258124b69ccb61ccbed600c32e08c775e0544 /sound | |
| parent | 9bfc5d3d4844bcb66405f2ffbbf172c50b90414e (diff) | |
| download | linux-3.10-6f06330c7a0464591a4d43532654dbaf5dd509d1.tar.gz linux-3.10-6f06330c7a0464591a4d43532654dbaf5dd509d1.tar.bz2 linux-3.10-6f06330c7a0464591a4d43532654dbaf5dd509d1.zip | |
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 <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_analog.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 5a6527668c0..290e09825b8 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -3667,6 +3667,7 @@ static int ad1884_parse_auto_config(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); |