summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>2015-11-18 16:49:52 -0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-11-20 01:20:36 +0100
commit768acd64d68b232e0d2b9623d9846457355f0c27 (patch)
tree65b4962b7b9b61599f42544645367dee0c545c48 /drivers
parent29dbe1f0af88b4162d2b57e790db7a51ab061f35 (diff)
downloadlinux-768acd64d68b232e0d2b9623d9846457355f0c27.tar.bz2
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: 50230713b639 ("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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/probe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 064078e11017..dc8fbe5c09d3 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -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);