summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-12-29 13:22:08 +0100
committerJesse Barnes <jbarnes@virtuousgeek.org>2011-01-14 17:55:43 +0100
commit0f953bf6b4efa0daddb7c418130a9bd3ee97f7ed (patch)
tree4a24901b0ff701e80787e39d87603bdd4b762876 /drivers/pci/pci.c
parentPCI/PM: Use pm_wakeup_event() directly for reporting wakeup events (diff)
downloadlinux-0f953bf6b4efa0daddb7c418130a9bd3ee97f7ed.tar.xz
linux-0f953bf6b4efa0daddb7c418130a9bd3ee97f7ed.zip
PCI/PM: Report wakeup events before resuming devices
Make wakeup events be reported by the PCI subsystem before attempting to resume devices or queuing up runtime resume requests for them, because wakeup events should be reported as soon as they have been detected. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index bf7ad2c09955..b714d787bddd 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1308,8 +1308,8 @@ bool pci_check_pme_status(struct pci_dev *dev)
static int pci_pme_wakeup(struct pci_dev *dev, void *ign)
{
if (pci_check_pme_status(dev)) {
- pm_request_resume(&dev->dev);
pci_wakeup_event(dev);
+ pm_request_resume(&dev->dev);
}
return 0;
}