summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_generic.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-07-25 17:01:14 +0200
committerTakashi Iwai <tiwai@suse.de>2016-07-25 17:01:14 +0200
commitcf81d6b583444cb6f5e656f050e43413b236354e (patch)
tree646567ef019e0bbc5cc9db0e26c464a9fc239481 /sound/pci/hda/hda_generic.c
parentALSA: usb-audio: Fix quirks code is not called (diff)
parentALSA: echoaudio: purge contradictions between dimension matrix members and to... (diff)
downloadlinux-cf81d6b583444cb6f5e656f050e43413b236354e.tar.xz
linux-cf81d6b583444cb6f5e656f050e43413b236354e.zip
Merge branch 'for-next' into for-linus
Merged 4.8 changes.
Diffstat (limited to 'sound/pci/hda/hda_generic.c')
-rw-r--r--sound/pci/hda/hda_generic.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 79c7b340acc2..e7c8f4f076d5 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -2492,10 +2492,6 @@ static int create_loopback_mixing_ctl(struct hda_codec *codec)
if (!snd_hda_gen_add_kctl(spec, NULL, &loopback_mixing_enum))
return -ENOMEM;
spec->have_aamix_ctl = 1;
- /* if no explicit aamix path is present (e.g. for Realtek codecs),
- * enable aamix as default -- just for compatibility
- */
- spec->aamix_mode = !has_aamix_out_paths(spec);
return 0;
}