[PATCH] PCI: Fix logic OF logic in pci_dma_configure()

From	Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Newsgroups	linux.kernel
Subject	[PATCH] PCI: Fix logic OF logic in pci_dma_configure()
Date	2015-11-19 02:00 +0100
Message-ID	<qwlJT-2a0-7@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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: 50230713b639 ("PCI: OF: Move of_pci_dma_configure() to pci_dma_configure()")
Reported-by: Robin Murphy <robin.murphy@arm.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
---
 drivers/pci/probe.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index e735c72..edb1984 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1685,8 +1685,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);
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] PCI: Fix logic OF logic in pci_dma_configure() Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> - 2015-11-19 02:00 +0100
  Re: [PATCH] PCI: Fix logic OF logic in pci_dma_configure() "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-11-19 02:30 +0100
  Re: [PATCH] PCI: Fix logic OF logic in pci_dma_configure() Arnd Bergmann <arnd@arndb.de> - 2015-11-19 09:30 +0100

csiph-web