From 38ffc2a0a6fcb082e460dd1410757e54d95d8ffe Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Wed, 10 Apr 2013 10:32:51 +0000 Subject: [PATCH] --- yaml --- r: 362896 b: refs/heads/master c: ffaddbe8f925a4f41eecb31e7fe69a9bdb6e2e59 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9cfe4c767135..1f48e997c9d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 769ba7212f2059ca9fe0c73371e3d415c8c1c529 +refs/heads/master: ffaddbe8f925a4f41eecb31e7fe69a9bdb6e2e59 diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c index fc9bd81e8e3b..a5e0e5f4953c 100644 --- a/trunk/drivers/pci/pci.c +++ b/trunk/drivers/pci/pci.c @@ -1571,7 +1571,7 @@ void pci_pme_active(struct pci_dev *dev, bool enable) { u16 pmcsr; - if (!dev->pm_cap) + if (!dev->pme_support) return; pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr); @@ -1920,6 +1920,7 @@ void pci_pm_init(struct pci_dev *dev) dev->wakeup_prepared = false; dev->pm_cap = 0; + dev->pme_support = 0; /* find PCI PM capability in list */ pm = pci_find_capability(dev, PCI_CAP_ID_PM); @@ -1971,8 +1972,6 @@ void pci_pm_init(struct pci_dev *dev) device_set_wakeup_capable(&dev->dev, true); /* Disable the PME# generation functionality */ pci_pme_active(dev, false); - } else { - dev->pme_support = 0; } }