diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2012-05-09 12:36:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-09 12:36:22 +0200 |
| commit | a2d96e778d1b15d2213f3b7737aa86fd8eda44cb (patch) | |
| tree | da44538e096a40b3549100c43cae0fd640159111 /sound/pci/hda/hda_codec.h | |
| parent | ALSA: hda - Remove pre_resume and post_suspend ops (diff) | |
| download | linux-dev-a2d96e778d1b15d2213f3b7737aa86fd8eda44cb.tar.xz linux-dev-a2d96e778d1b15d2213f3b7737aa86fd8eda44cb.zip | |
ALSA: hda - More robustify the power-up/down sequence
Check the power_transition up/down state instead of boolean bit, so
that the power-up sequence can cancel the pending power-down work
properly. Also, by moving cancel_delayed_work_sync() before the
actual power-up sequence, make sure that the delayed power-down is
completed.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
| -rw-r--r-- | sound/pci/hda/hda_codec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 78f89147d620..fce30b42bc46 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -859,7 +859,7 @@ struct hda_codec { unsigned int no_jack_detect:1; /* Machine has no jack-detection */ #ifdef CONFIG_SND_HDA_POWER_SAVE unsigned int power_on :1; /* current (global) power-state */ - unsigned int power_transition :1; /* power-state in transition */ + int power_transition; /* power-state in transition */ int power_count; /* current (global) power refcount */ struct delayed_work power_work; /* delayed task for powerdown */ unsigned long power_on_acct; |