Skip to content

L
linux-davinci
Commit e23573d7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'fix/hda' into topic/hda

parents e2ea57a8 d14a7e0b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
sound/pci/hda/hda_intel.c
View file @ e23573d7
...@@ -1947,16 +1947,13 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state) ...@@ -1947,16 +1947,13 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state)
return 0; return 0;
} }
static int azx_resume_early(struct pci_dev *pci)
{
return pci_restore_state(pci);
}
static int azx_resume(struct pci_dev *pci) static int azx_resume(struct pci_dev *pci)
{ {
struct snd_card *card = pci_get_drvdata(pci); struct snd_card *card = pci_get_drvdata(pci);
struct azx *chip = card->private_data; struct azx *chip = card->private_data;
pci_set_power_state(pci, PCI_D0);
pci_restore_state(pci);
if (pci_enable_device(pci) < 0) { if (pci_enable_device(pci) < 0) {
printk(KERN_ERR "hda-intel: pci_enable_device failed, " printk(KERN_ERR "hda-intel: pci_enable_device failed, "
"disabling device\n"); "disabling device\n");
...@@ -2480,7 +2477,6 @@ static struct pci_driver driver = { ...@@ -2480,7 +2477,6 @@ static struct pci_driver driver = {
.remove = __devexit_p(azx_remove), .remove = __devexit_p(azx_remove),
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = azx_suspend, .suspend = azx_suspend,
.resume_early = azx_resume_early,
.resume = azx_resume, .resume = azx_resume,
#endif #endif
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment