diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-08-20 21:25:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-20 21:25:22 +0200 |
| commit | 535b6c51fe8293c88ce919cdfc4390c67a1cb6d1 (patch) | |
| tree | 590d8f39fbdef4f2ce92525e291ae442520e1cf3 | |
| parent | f0b433e9f362e0b7f0ce7d1489dd7feba068605d (diff) | |
| download | op-kernel-dev-535b6c51fe8293c88ce919cdfc4390c67a1cb6d1.zip op-kernel-dev-535b6c51fe8293c88ce919cdfc4390c67a1cb6d1.tar.gz | |
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: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index c3077d5..f560051 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -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. */ if (codec->power_on) { + if (codec->power_transition < 0) + codec->power_transition = 0; spin_unlock(&codec->power_lock); return; } |
