Commit 535b6c51 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Fix leftover codec->power_transition

When the codec turn-on operation is canceled by the immediate
power-on, the driver left the power_transition flag as is.
This caused the persistent avoidance of power-save behavior.

Cc: <stable@vger.kernel.org> [v3.5+]
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f0b433e9
...@@ -4454,6 +4454,8 @@ static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down) ...@@ -4454,6 +4454,8 @@ static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down)
* then there is no need to go through power up here. * then there is no need to go through power up here.
*/ */
if (codec->power_on) { if (codec->power_on) {
if (codec->power_transition < 0)
codec->power_transition = 0;
spin_unlock(&codec->power_lock); spin_unlock(&codec->power_lock);
return; return;
} }
......
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