ALSA: hda - Don't power up when not powered down.

commit b43d224767e426cf1a8b6622d1d172f2b2b0e857 upstream.

After cancel_delayed_work_sync returns, the power down work either never
started (power_on == 1) or finished (power_on == 0).  In the former case
there is no need to power up again.

Signed-off-by: Dylan Reid <dgreid@chromium.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 51cb2a2e4fce03fbfdce96fb4b2c1b23063d45ed..4e17033fd2345e3fa294eb2b0edff5919a863b88 100644 (file)
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -4418,6 +4418,13 @@ static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down)
        cancel_delayed_work_sync(&codec->power_work);
 
        spin_lock(&codec->power_lock);
+       /* If the power down delayed work was cancelled above before starting,
+        * then there is no need to go through power up here.
+        */
+       if (codec->power_on) {
+               spin_unlock(&codec->power_lock);
+               return;
+       }
        trace_hda_power_up(codec);
        snd_hda_update_power_acct(codec);
        codec->power_on = 1;