summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMaxim Levitsky <maximlevitsky@gmail.com>2007-09-03 15:26:57 +0200
committerJaroslav Kysela <perex@perex.cz>2007-10-16 15:59:46 +0200
commit2e4924628ad957f702631a7a049c586a780f00f8 (patch)
treee0a653b659c8bb8a17c7d26b054bd9b7f4548ef1 /sound
parentb7e054a76fdc42b442c003f8d19ee5dce6b55f02 (diff)
downloadop-kernel-dev-2e4924628ad957f702631a7a049c586a780f00f8.zip
op-kernel-dev-2e4924628ad957f702631a7a049c586a780f00f8.tar.gz
[ALSA] hda-intel - fix a race in dynamic power managment
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_codec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 46d4253..08104e2 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -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)
OpenPOWER on IntegriCloud