From 6d7d29831576d80148d07f65c664e457938e9716 Mon Sep 17 00:00:00 2001 From: Kenji Kaneshige Date: Mon, 22 Feb 2010 14:12:24 +0900 Subject: [PATCH] --- yaml --- r: 180991 b: refs/heads/master c: 552be54cc4232dc5acc49ccb372129d6f1b6923f h: refs/heads/master i: 180989: 3e7a9955e4467cf048650220d5c21fbf2c7d427b 180987: 680f6eb1448b50a852544f6b14ae4a56054263c5 180983: ba375645d22160dbed988b9b349b9b1e1d0f4c7a 180975: 2e5a51eec687bec8d9e325b600c82de0938329b0 180959: baed09b079e65a56130e92f543a1e092beb76f08 180927: 3de6911f9ed1263391a859a9414325ccbc823db2 180863: c604f4472054ced0cc16ebb767314453066a7aed 180735: fe63ced329027591722de69ca5861df56b6dca55 v: v3 --- [refs] | 2 +- trunk/drivers/pci/pcie/pme/pcie_pme.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f5d2f970084c..afee92e472fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b67ea76172d4b1922c4b3c46c8ea8e9fec1ff38c +refs/heads/master: 552be54cc4232dc5acc49ccb372129d6f1b6923f diff --git a/trunk/drivers/pci/pcie/pme/pcie_pme.c b/trunk/drivers/pci/pcie/pme/pcie_pme.c index 51a69061b120..6b516309c094 100644 --- a/trunk/drivers/pci/pcie/pme/pcie_pme.c +++ b/trunk/drivers/pci/pcie/pme/pcie_pme.c @@ -144,7 +144,7 @@ static bool pcie_pme_walk_bus(struct pci_bus *bus) list_for_each_entry(dev, &bus->devices, bus_list) { /* Skip PCIe devices in case we started from a root port. */ - if (!dev->is_pcie && pci_check_pme_status(dev)) { + if (!pci_is_pcie(dev) && pci_check_pme_status(dev)) { pm_request_resume(&dev->dev); ret = true; } @@ -177,7 +177,7 @@ static bool pcie_pme_from_pci_bridge(struct pci_bus *bus, u8 devfn) if (!dev) return false; - if (dev->is_pcie && dev->pcie_type == PCI_EXP_TYPE_PCI_BRIDGE) { + if (pci_is_pcie(dev) && dev->pcie_type == PCI_EXP_TYPE_PCI_BRIDGE) { down_read(&pci_bus_sem); if (pcie_pme_walk_bus(bus)) found = true; @@ -389,7 +389,7 @@ static void pcie_pme_mark_devices(struct pci_dev *port) down_read(&pci_bus_sem); list_for_each_entry(dev, &bus->devices, bus_list) - if (dev->is_pcie + if (pci_is_pcie(dev) && dev->pcie_type == PCI_EXP_TYPE_RC_END) pcie_pme_set_native(dev, NULL); up_read(&pci_bus_sem);