Skip to content

Commit

Permalink
Merge branch 'fix/hda' into for-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
tiwai committed Feb 19, 2009
2 parents d2f8d7e + d14a7e0 commit 379752f
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions sound/pci/hda/hda_intel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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
};
Expand Down

0 comments on commit 379752f

Please sign in to comment.