diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2012-09-14 17:48:41 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-18 16:50:33 -0600 |
| commit | 817a268516f3aaf9e54c5a0f880de37d03ef4c79 (patch) | |
| tree | aecb250c24a120c7c9cc49c8506e55dad74bd726 /drivers/pci/bus.c | |
| parent | 1965f66e7db08d1ebccd24a59043eba826cc1ce8 (diff) | |
| download | linux-817a268516f3aaf9e54c5a0f880de37d03ef4c79.tar.gz | |
PCI: Use correct type when freeing bus resource list
Should use struct pci_bus_resource instead of struct pci_host_bridge_window
Commit 45ca9e9730 ("PCI: add helpers for building PCI bus resource lists")
added pci_free_resource_list() and used it in pci_bus_remove_resources().
Later it was also used for host bridge aperture lists, which was fine until
commit 0efd5aab41 ("PCI: add struct pci_host_bridge_window with CPU/bus
address offset"). That commit added offset information, so we needed a
struct pci_host_bridge_window that was separate from struct
pci_bus_resource.
Commit 0efd5aab41 should have split the host bridge aperture users of
pci_free_resource_list() from the pci_bus_resource user
(pci_bus_remove_resources()), but it did not.
[bhelgaas: changelog -- 0efd5aab41 was mine, so this is all my fault]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>Diffstat (limited to 'drivers/pci/bus.c')
| -rw-r--r-- | drivers/pci/bus.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 4b0970b46e0b..6241fd05bd41 100644 --- a/drivers/pci/bus.c +++ b/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); + } } /** |