Commit c7cd0ef6 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Fix path power activation

The widget power-saving code tries to turn up/down the power of each
widget in the I/O paths that are modified at each jack plug/unplug.
The recent report revealed that the power activation leaves some
widgets unpowered after plugging.  This is because
snd_hda_activate_path() turns on path->active flag at the end of the
function while the path power management is done before that.  Then
it's regarded as if nothing is active, and the driver turns off the
power.

The fix is simply to set the flag at the beginning of the function,
before trying to power up.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=102521
Cc: <stable@vger.kernel.org> [v4.1+]
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9d2b48f7
...@@ -884,8 +884,7 @@ void snd_hda_activate_path(struct hda_codec *codec, struct nid_path *path, ...@@ -884,8 +884,7 @@ void snd_hda_activate_path(struct hda_codec *codec, struct nid_path *path,
struct hda_gen_spec *spec = codec->spec; struct hda_gen_spec *spec = codec->spec;
int i; int i;
if (!enable) path->active = enable;
path->active = false;
/* make sure the widget is powered up */ /* make sure the widget is powered up */
if (enable && (spec->power_down_unused || codec->power_save_node)) if (enable && (spec->power_down_unused || codec->power_save_node))
...@@ -903,9 +902,6 @@ void snd_hda_activate_path(struct hda_codec *codec, struct nid_path *path, ...@@ -903,9 +902,6 @@ void snd_hda_activate_path(struct hda_codec *codec, struct nid_path *path,
if (has_amp_out(codec, path, i)) if (has_amp_out(codec, path, i))
activate_amp_out(codec, path, i, enable); activate_amp_out(codec, path, i, enable);
} }
if (enable)
path->active = true;
} }
EXPORT_SYMBOL_GPL(snd_hda_activate_path); EXPORT_SYMBOL_GPL(snd_hda_activate_path);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment