From 1c2c01a84f3394ae0501f225a0a3f35e34c1d942 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 16 Feb 2009 10:23:35 +0100
Subject: [PATCH] --- yaml --- r: 133053 b: refs/heads/master c:
 e23573d7e350b06416f311f0129b945d33492001 h: refs/heads/master i:   133051:
 d49e0432c4907164f429c00a4eb50d25dd6a1879 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_intel.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 93e2b9b5bb2b..db67a1fda23c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2ea57a8df6da45f5f63ab7b56528a552f36fb72
+refs/heads/master: e23573d7e350b06416f311f0129b945d33492001
diff --git a/trunk/sound/pci/hda/hda_intel.c b/trunk/sound/pci/hda/hda_intel.c
index e853e4a8bde9..c5a5dc5698a2 100644
--- a/trunk/sound/pci/hda/hda_intel.c
+++ b/trunk/sound/pci/hda/hda_intel.c
@@ -1947,16 +1947,13 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state)
 	return 0;
 }
 
-static int azx_resume_early(struct pci_dev *pci)
-{
-	return pci_restore_state(pci);
-}
-
 static int azx_resume(struct pci_dev *pci)
 {
 	struct snd_card *card = pci_get_drvdata(pci);
 	struct azx *chip = card->private_data;
 
+	pci_set_power_state(pci, PCI_D0);
+	pci_restore_state(pci);
 	if (pci_enable_device(pci) < 0) {
 		printk(KERN_ERR "hda-intel: pci_enable_device failed, "
 		       "disabling device\n");
@@ -2480,7 +2477,6 @@ static struct pci_driver driver = {
 	.remove = __devexit_p(azx_remove),
 #ifdef CONFIG_PM
 	.suspend = azx_suspend,
-	.resume_early = azx_resume_early,
 	.resume = azx_resume,
 #endif
 };