Commit d0b7b3a4 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 7e229f0e e5422327

drivers/pci/probe.c

+3 −1
Original line number Diff line number Diff line
@@ -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);