summaryrefslogtreecommitdiff
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2017-07-02 18:49:49 -0500
committerBjorn Helgaas <bhelgaas@google.com>2017-07-02 18:49:49 -0500
commit8cd93850347bb4487d332d6638a22c7686ae237d (patch)
tree85b22746847e5690692245d5d3a5d2b0ea93dff5 /drivers/pci/pci.c
parent74da4a0180fb2091802087764e67ac5e53667217 (diff)
parent13cfc732160f7bc7e596128ce34cda361c556966 (diff)
Merge branch 'pci/resource' into next
* pci/resource: PCI: Work around poweroff & suspend-to-RAM issue on Macbook Pro 11 PCI: Do not disregard parent resources starting at 0x0 Conflicts: arch/x86/pci/fixup.c
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 59f29e3da4bc..703741242375 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -455,7 +455,7 @@ struct resource *pci_find_parent_resource(const struct pci_dev *dev,
pci_bus_for_each_resource(bus, r, i) {
if (!r)
continue;
- if (res->start && resource_contains(r, res)) {
+ if (resource_contains(r, res)) {
/*
* If the window is prefetchable but the BAR is