summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2008-12-06 15:09:08 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-07 10:45:32 +0100
commit32e176c14d7a425b681ef003c9061001ddb7fc7b (patch)
treea1b7f93172e5739e741d8129f80a6ce35530280f /sound
parent061e41fdb5047b1fb161e89664057835935ca1d2 (diff)
downloadop-kernel-dev-32e176c14d7a425b681ef003c9061001ddb7fc7b.zip
op-kernel-dev-32e176c14d7a425b681ef003c9061001ddb7fc7b.tar.gz
Sound: hda - Restore PCI configuration space with interrupts off
Move the restoration of the standard PCI configuration registers in the snd_hda_intel driver to a ->resume_early() callback executed with interrupts disabled, since doing that with interrupts enabled may lead to problems in some cases. This patch addresses the regression from 2.6.26 tracked as http://bugzilla.kernel.org/show_bug.cgi?id=12121 . Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
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 35722ec..a06b053 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1951,13 +1951,16 @@ 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");
@@ -2465,6 +2468,7 @@ 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
};
OpenPOWER on IntegriCloud