Commit cad3ab58 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pci-v3.20-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI resource management fix from Bjorn Helgaas:
 "This fixes a double kfree in code we merged for v3.20:

  Remove duplicate kfree in of_pci_get_host_bridge_resources() (Lorenzo
  Pieralisi)"

* tag 'pci-v3.20-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  of/pci: Remove duplicate kfree in of_pci_get_host_bridge_resources()
parents 53861af9 feb28979
...@@ -229,7 +229,6 @@ int of_pci_get_host_bridge_resources(struct device_node *dev, ...@@ -229,7 +229,6 @@ int of_pci_get_host_bridge_resources(struct device_node *dev,
resource_list_for_each_entry(window, resources) resource_list_for_each_entry(window, resources)
kfree(window->res); kfree(window->res);
pci_free_resource_list(resources); pci_free_resource_list(resources);
kfree(bus_range);
return err; return err;
} }
EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources); EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment