aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2007-08-13 15:29:04 +0200
committerJaroslav Kysela <perex@perex.cz>2007-10-16 15:58:49 +0200
commit95e99fdadb34debebd8dd35bb5a18b253dece22d (patch)
tree5e402674ca1b08ba9a6c80a96e07bf2c08488b7d
parent51882453a729675aa7266aa87d99f33eca310c86 (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>
-rw-r--r--sound/pci/hda/hda_codec.c2
-rw-r--r--sound/pci/hda/hda_intel.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 9a3b72824f8..efd56a3396b 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)
AC_PWRST_D3);
#ifdef CONFIG_SND_HDA_POWER_SAVE
cancel_delayed_work(&codec->power_work);
+ codec->power_on = 0;
#endif
}
@@ -2195,7 +2196,6 @@ static void hda_power_work(struct work_struct *work)
return;
hda_call_codec_suspend(codec);
- codec->power_on = 0;
if (codec->bus->ops.pm_notify)
codec->bus->ops.pm_notify(codec);
}
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 7be3a9b5533..f9c7c2e4f92 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1500,7 +1500,7 @@ static int azx_acquire_irq(struct azx *chip, int do_disconnect)
static void azx_stop_chip(struct azx *chip)
{
- if (chip->initialized)
+ if (!chip->initialized)
return;
/* disable interrupts */