aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-20 17:41:18 -0500
committerTakashi Iwai <tiwai@suse.de>2008-12-20 17:41:18 -0500
commit8326e32c1e148820d50dc460e1cb4a6cb6884ff2 (patch)
tree839fbfa0b24ba5227b026d0925cf9f09c3af4ebb /sound
parent69dfaefee4a2dfdfee3488a306403fe1e51f0be5 (diff)
parent32e176c14d7a425b681ef003c9061001ddb7fc7b (diff)
Merge branch 'topic/hda-resume-fix' into topic/hda
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 6613b6bef9eb..f04de115ee11 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1947,13 +1947,16 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state)
1947 return 0; 1947 return 0;
1948} 1948}
1949 1949
1950static int azx_resume_early(struct pci_dev *pci)
1951{
1952 return pci_restore_state(pci);
1953}
1954
1950static int azx_resume(struct pci_dev *pci) 1955static int azx_resume(struct pci_dev *pci)
1951{ 1956{
1952 struct snd_card *card = pci_get_drvdata(pci); 1957 struct snd_card *card = pci_get_drvdata(pci);
1953 struct azx *chip = card->private_data; 1958 struct azx *chip = card->private_data;
1954 1959
1955 pci_set_power_state(pci, PCI_D0);
1956 pci_restore_state(pci);
1957 if (pci_enable_device(pci) < 0) { 1960 if (pci_enable_device(pci) < 0) {
1958 printk(KERN_ERR "hda-intel: pci_enable_device failed, " 1961 printk(KERN_ERR "hda-intel: pci_enable_device failed, "
1959 "disabling device\n"); 1962 "disabling device\n");
@@ -2465,6 +2468,7 @@ static struct pci_driver driver = {
2465 .remove = __devexit_p(azx_remove), 2468 .remove = __devexit_p(azx_remove),
2466#ifdef CONFIG_PM 2469#ifdef CONFIG_PM
2467 .suspend = azx_suspend, 2470 .suspend = azx_suspend,
2471 .resume_early = azx_resume_early,
2468 .resume = azx_resume, 2472 .resume = azx_resume,
2469#endif 2473#endif
2470}; 2474};