Patchwork PCI: Use correct type when freeing bus resource list

login
register
mail settings
Submitter Yinghai Lu
Date Sept. 15, 2012, 12:48 a.m.
Message ID <1347670122-25824-2-git-send-email-yinghai@kernel.org>
Download mbox | patch
Permalink /patch/184056/
State Accepted
Headers show

Comments

Yinghai Lu - Sept. 15, 2012, 12:48 a.m.
Should use struct pci_bus_resource instead of struct pci_host_bridge_window

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
 drivers/pci/bus.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Bjorn Helgaas - Sept. 18, 2012, 10:53 p.m.
On Fri, Sep 14, 2012 at 6:48 PM, Yinghai Lu <yinghai@kernel.org> wrote:
> Should use struct pci_bus_resource instead of struct pci_host_bridge_window

Looks good, and this is all my fault, sorry.  Applied to a
pci/yinghai-misc branch.

> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
>
> ---
>  drivers/pci/bus.c |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> Index: linux-2.6/drivers/pci/bus.c
> ===================================================================
> --- linux-2.6.orig/drivers/pci/bus.c
> +++ linux-2.6/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);
> +       }
>  }
>
>  /**
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: linux-2.6/drivers/pci/bus.c
===================================================================
--- linux-2.6.orig/drivers/pci/bus.c
+++ linux-2.6/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);
+	}
 }
 
 /**