projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/usb' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
sound
/
pci
/
hda
/
patch_analog.c
diff --git
a/sound/pci/hda/patch_analog.c
b/sound/pci/hda/patch_analog.c
index 5a6527668c075bcb72e813d6fa065641357a5584..290e09825b825716ec1c72abf37b35b8ba442db2 100644
(file)
--- 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);