diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2009-02-19 13:57:52 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-19 13:57:52 +0100 |
| commit | 379752fdf8d2e2be2e7da84300bbf73e4f78c36f (patch) | |
| tree | f8553e10df696b1346a7123567903924eeba6199 /sound | |
| parent | Linux 2.6.29-rc5 (diff) | |
| parent | Revert "Sound: hda - Restore PCI configuration space with interrupts off" (diff) | |
| download | linux-dev-379752fdf8d2e2be2e7da84300bbf73e4f78c36f.tar.xz linux-dev-379752fdf8d2e2be2e7da84300bbf73e4f78c36f.zip | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 11e791b965f6..c8d9178f47e5 100644 --- a/sound/pci/hda/hda_intel.c +++ b/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"); @@ -2468,7 +2465,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 }; |