diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-18 09:43:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-18 09:43:46 -0800 |
| commit | cad3ab5883b35b044200820bf2e1fbabe742740a (patch) | |
| tree | 0fdb7fdb120be502f7d0976e98fa19be46b28ffb | |
| parent | 53861af9a17022898619a2ae4ead0dfc601b7c13 (diff) | |
| parent | feb28979c137ba3f649ad36fc27c85c64c111f78 (diff) | |
| download | linux-cad3ab5883b35b044200820bf2e1fbabe742740a.tar.bz2 | |
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()
| -rw-r--r-- | drivers/of/of_pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c index 110fece2ff53..62426d81a4d6 100644 --- a/drivers/of/of_pci.c +++ b/drivers/of/of_pci.c @@ -229,7 +229,6 @@ parse_failed: 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); |