diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-03 02:49:49 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-03 02:49:49 +0300 |
| commit | 8cd93850347bb4487d332d6638a22c7686ae237d (patch) | |
| tree | 85b22746847e5690692245d5d3a5d2b0ea93dff5 /drivers | |
| parent | 74da4a0180fb2091802087764e67ac5e53667217 (diff) | |
| parent | 13cfc732160f7bc7e596128ce34cda361c556966 (diff) | |
| download | linux-8cd93850347bb4487d332d6638a22c7686ae237d.tar.xz | |
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')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
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 |