aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-05-09 06:36:22 -0400
committerTakashi Iwai <tiwai@suse.de>2012-05-09 06:36:22 -0400
commita2d96e778d1b15d2213f3b7737aa86fd8eda44cb (patch)
treeda44538e096a40b3549100c43cae0fd640159111 /sound/pci/hda/hda_codec.h
parent607d4f7f0551eb591fbaca4bf44a8d6251e82f00 (diff)
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.h2
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 {
859 unsigned int no_jack_detect:1; /* Machine has no jack-detection */ 859 unsigned int no_jack_detect:1; /* Machine has no jack-detection */
860#ifdef CONFIG_SND_HDA_POWER_SAVE 860#ifdef CONFIG_SND_HDA_POWER_SAVE
861 unsigned int power_on :1; /* current (global) power-state */ 861 unsigned int power_on :1; /* current (global) power-state */
862 unsigned int power_transition :1; /* power-state in transition */ 862 int power_transition; /* power-state in transition */
863 int power_count; /* current (global) power refcount */ 863 int power_count; /* current (global) power refcount */
864 struct delayed_work power_work; /* delayed task for powerdown */ 864 struct delayed_work power_work; /* delayed task for powerdown */
865 unsigned long power_on_acct; 865 unsigned long power_on_acct;