Commit 768acd64 authored Nov 18, 2015 by Suravee Suthikulpanit Committed by Rafael J. Wysocki Nov 20, 2015

PCI: Fix OF logic in pci_dma_configure()



This patch fixes a bug introduced by previous commit,
which incorrectly checkes the of_node of the end-point device.
Instead, it should check the of_node of the host bridge.

Fixes: 50230713 ("PCI: OF: Move of_pci_dma_configure() to pci_dma_configure()")
Reported-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 29dbe1f0

drivers/pci/probe.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1646,8 +1646,8 @@ static void pci_dma_configure(struct pci_dev *dev)
		{
		struct device *bridge = pci_get_host_bridge_device(dev);

		if (IS_ENABLED(CONFIG_OF) && dev->dev.of_node) {
		if (bridge->parent)
		if (IS_ENABLED(CONFIG_OF) &&
		bridge->parent && bridge->parent->of_node) {
		of_dma_configure(&dev->dev, bridge->parent->of_node);
		} else if (has_acpi_companion(bridge)) {
		struct acpi_device *adev = to_acpi_device_node(bridge->fwnode);