diff --git a/[refs] b/[refs] index 842b2a8e13fc..22e59c3b5863 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1965f66e7db08d1ebccd24a59043eba826cc1ce8 +refs/heads/master: 817a268516f3aaf9e54c5a0f880de37d03ef4c79 diff --git a/trunk/drivers/pci/bus.c b/trunk/drivers/pci/bus.c index 4b0970b46e0b..6241fd05bd41 100644 --- a/trunk/drivers/pci/bus.c +++ b/trunk/drivers/pci/bus.c @@ -87,11 +87,15 @@ EXPORT_SYMBOL_GPL(pci_bus_resource_n); void pci_bus_remove_resources(struct pci_bus *bus) { int i; + struct pci_bus_resource *bus_res, *tmp; for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) bus->resource[i] = NULL; - pci_free_resource_list(&bus->resources); + list_for_each_entry_safe(bus_res, tmp, &bus->resources, list) { + list_del(&bus_res->list); + kfree(bus_res); + } } /**