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

Commit 5c493df2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pci/host-generic' of... 

Merge branch 'pci/host-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci into acpi-resources

modified:   drivers/of/of_pci.c

This fixes a build failure after merging the 'acpi-resources' branch
with the PCI tree caused by bad interactions between that branch and
the only commit in 'pci/host-generic'.  Also that commit contains a
bug which can be fixed by removing one line of code, so do that too.

Link: http://marc.info/?l=linux-kernel&m=142344882101429&w=2
Link: http://marc.info/?l=linux-next&m=142346304003932&w=2


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c183619b

drivers/of/of_pci.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -140,6 +140,7 @@ int of_pci_get_host_bridge_resources(struct device_node *dev, 
			unsigned char busno, unsigned char bus_max,

			unsigned char busno, unsigned char bus_max,

			struct list_head *resources, resource_size_t *io_base)

			struct list_head *resources, resource_size_t *io_base)

{

{

	struct resource_entry *window;

	struct resource *res;

	struct resource *res;

	struct resource *bus_range;

	struct resource *bus_range;

	struct of_pci_range range;

	struct of_pci_range range;
@@ -225,6 +226,8 @@ int of_pci_get_host_bridge_resources(struct device_node *dev, 
conversion_failed:

conversion_failed:

	kfree(res);

	kfree(res);

parse_failed:

parse_failed:

	resource_list_for_each_entry(window, resources)

		kfree(window->res);

	pci_free_resource_list(resources);

	pci_free_resource_list(resources);

	return err;

	return err;

}

}