summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-04-09 10:28:15 +0200
committerTakashi Iwai <tiwai@suse.de>2015-04-09 10:34:00 +0200
commit24fef9022a83d789ee372a393ea4782dc22b9b51 (patch)
tree347f95b86bc6658499de9d2f53088adedb83b61d /sound/pci
parentb6c09b3c7b54743cbc58af8c27bbae8299c4f8cc (diff)
downloadlinux-24fef9022a83d789ee372a393ea4782dc22b9b51.tar.bz2
ALSA: hda/generic - Don't override power_filter when power_save_node is set
Currently the generic parser sets codec->power_filter when power_save_node flag is set. But this overrides the existing filter that has been already set by the codec driver, thus it looses some features. Instead, set the default power_filter only when it's not set yet. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/hda_generic.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index f0475a19fad7..3d2597b7037b 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -4918,7 +4918,8 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec,
parse_digital(codec);
if (spec->power_down_unused || codec->power_save_node)
- codec->power_filter = snd_hda_gen_path_power_filter;
+ if (!codec->power_filter)
+ codec->power_filter = snd_hda_gen_path_power_filter;
if (!spec->no_analog && spec->beep_nid) {
err = snd_hda_attach_beep_device(codec, spec->beep_nid);