diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2015-04-09 10:25:03 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-09 10:33:53 +0200 |
| commit | b6c09b3c7b54743cbc58af8c27bbae8299c4f8cc (patch) | |
| tree | 7e181550419c398fa9e8964c0a0c436f2a88e34e /sound/pci/hda | |
| parent | ALSA: hda/generic - Fix wrong initial power state for fixed pins (diff) | |
| download | linux-dev-b6c09b3c7b54743cbc58af8c27bbae8299c4f8cc.tar.xz linux-dev-b6c09b3c7b54743cbc58af8c27bbae8299c4f8cc.zip | |
ALSA: hda/generic - Make snd_hda_gen_path_power_filter() always applicable
Add the check of power_save_node flag at the beginning of the function
so that it skips the rest if the flag isn't set. In this way, we can
call this function safely no matter whether the widget power-saving is
really used or not.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
| -rw-r--r-- | sound/pci/hda/hda_generic.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 46b559832d2c..f0475a19fad7 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -4703,6 +4703,10 @@ unsigned int snd_hda_gen_path_power_filter(struct hda_codec *codec, hda_nid_t nid, unsigned int power_state) { + struct hda_gen_spec *spec = codec->spec; + + if (!spec->power_down_unused && !codec->power_save_node) + return power_state; if (power_state != AC_PWRST_D0 || nid == codec->core.afg) return power_state; if (get_wcaps_type(get_wcaps(codec, nid)) >= AC_WID_POWER) |