Skip to content

Commit d0b7b3a

Browse files
committed
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
2 parents 7e229f0 + e542232 commit d0b7b3a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/pci/probe.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,8 +996,10 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
996996
resource_list_for_each_entry_safe(window, n, &resources) {
997997
offset = window->offset;
998998
res = window->res;
999-
if (!res->flags && !res->start && !res->end)
999+
if (!res->flags && !res->start && !res->end) {
1000+
release_resource(res);
10001001
continue;
1002+
}
10011003

10021004
list_move_tail(&window->node, &bridge->windows);
10031005

0 commit comments

Comments
 (0)