Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cad3ab58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

drivers/of/of_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -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);