summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2023-06-26 20:59:57 +0300
committerBjorn Helgaas <bhelgaas@google.com>2023-06-26 20:59:57 +0300
commitd0b7b3a422f1f550a1bac9fc3404196c10232d14 (patch)
treef0dc4547100bf8aa068f98f477bb206d42d11e37 /drivers/pci
parent7e229f0e054b148f9bf8eb9f70b8b18ee4677936 (diff)
parente54223275ba1bc6f704a6bab015fcd2ae4f72572 (diff)
downloadlinux-d0b7b3a422f1f550a1bac9fc3404196c10232d14.tar.xz
Merge branch 'pci/resource'
- When we coalesce host bridge windows, remove invalidated resources from the resource tree so future allocations work correctly (Ross Lagerwall) * pci/resource: PCI: Release resource invalidated by coalescing
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/probe.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index f547db0a728f..8bac3ce02609 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -996,8 +996,10 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
resource_list_for_each_entry_safe(window, n, &resources) {
offset = window->offset;
res = window->res;
- if (!res->flags && !res->start && !res->end)
+ if (!res->flags && !res->start && !res->end) {
+ release_resource(res);
continue;
+ }
list_move_tail(&window->node, &bridge->windows);