diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-08-13 09:29:04 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 09:58:49 -0400 |
commit | 95e99fdadb34debebd8dd35bb5a18b253dece22d (patch) | |
tree | 5e402674ca1b08ba9a6c80a96e07bf2c08488b7d /sound/pci/hda/hda_codec.c | |
parent | 51882453a729675aa7266aa87d99f33eca310c86 (diff) |
[ALSA] hda-intel - Fix resume with power save
The controller power wasn't turned on properly at resume due to the
power-saving patch. Now fixed.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 9a3b72824f87..efd56a3396bd 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -1662,6 +1662,7 @@ static void hda_call_codec_suspend(struct hda_codec *codec) | |||
1662 | AC_PWRST_D3); | 1662 | AC_PWRST_D3); |
1663 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 1663 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
1664 | cancel_delayed_work(&codec->power_work); | 1664 | cancel_delayed_work(&codec->power_work); |
1665 | codec->power_on = 0; | ||
1665 | #endif | 1666 | #endif |
1666 | } | 1667 | } |
1667 | 1668 | ||
@@ -2195,7 +2196,6 @@ static void hda_power_work(struct work_struct *work) | |||
2195 | return; | 2196 | return; |
2196 | 2197 | ||
2197 | hda_call_codec_suspend(codec); | 2198 | hda_call_codec_suspend(codec); |
2198 | codec->power_on = 0; | ||
2199 | if (codec->bus->ops.pm_notify) | 2199 | if (codec->bus->ops.pm_notify) |
2200 | codec->bus->ops.pm_notify(codec); | 2200 | codec->bus->ops.pm_notify(codec); |
2201 | } | 2201 | } |