Skip to content

Commit

Permalink
Merge tag 'pci-v3.20-fixes-1' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/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()
  • Loading branch information
Linus Torvalds committed Feb 18, 2015
2 parents 53861af + feb2897 commit cad3ab5
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/of/of_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ int of_pci_get_host_bridge_resources(struct device_node *dev,
resource_list_for_each_entry(window, resources)
kfree(window->res);
pci_free_resource_list(resources);
kfree(bus_range);
return err;
}
EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources);
Expand Down

0 comments on commit cad3ab5

Please sign in to comment.