diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-08-20 21:25:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-14 09:59:24 -0700 |
| commit | b74c2ca5e058c96cd7792e9ec07fb96e7c3a9a1d (patch) | |
| tree | 6f8147099f3cb4fbd189613728dddf6d518b2711 /sound | |
| parent | 183544678fab5e5d0a0d63c7d2d15bc15f98934f (diff) | |
ALSA: hda - Fix leftover codec->power_transition
commit 535b6c51fe8293c88ce919cdfc4390c67a1cb6d1 upstream.
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.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -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 4e17033fd234..c0fa6293c499 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -4422,6 +4422,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; } |