[ALSA] hda-intel - fix a race in dynamic power managment
authorMaxim Levitsky <maximlevitsky@gmail.com>
Mon, 3 Sep 2007 13:26:57 +0000 (15:26 +0200)
committerJaroslav Kysela <perex@perex.cz>
Tue, 16 Oct 2007 13:59:46 +0000 (15:59 +0200)
codec->power_transition is supposed to be true while codec is going
to be shut off if in the mean time somebody calls snd_hda_power_up,
hda_power_work will not shut down the codec, but nether will clear
codec->power_transition, thus it stays on forever. Fix this.

Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
sound/pci/hda/hda_codec.c

index 46d4253642d7f765510fc603269ac28fcae402eb..08104e2a3e99a550cc3ddf8e120e3161a651093c 100644 (file)
@@ -2195,8 +2195,10 @@ static void hda_power_work(struct work_struct *work)
        struct hda_codec *codec =
                container_of(work, struct hda_codec, power_work.work);
 
-       if (!codec->power_on || codec->power_count)
+       if (!codec->power_on || codec->power_count) {
+               codec->power_transition = 0;
                return;
+       }
 
        hda_call_codec_suspend(codec);
        if (codec->bus->ops.pm_notify)