Skip to content

Commit

Permalink
Merge branch 'pci/resource'
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
Bjorn Helgaas committed Jun 26, 2023
2 parents 7e229f0 + e542232 commit d0b7b3a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/pci/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit d0b7b3a

Please sign in to comment.