Commit e1afa7bb authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

PCI: keystone: Fix interrupt-controller-node lookup

commit eac56aa3 upstream.

Fix child-node lookup during initialisation which was using the wrong
OF-helper and ended up searching the whole device tree depth-first
starting at the parent rather than just matching on its children.

To make things worse, the parent pci node could end up being prematurely
freed as of_find_node_by_name() drops a reference to its first argument.
Any matching child interrupt-controller node was also leaked.

Fixes: 0c4ffcfe ("PCI: keystone: Add TI Keystone PCIe driver")
Cc: stable <stable@vger.kernel.org>     # 3.18
Acked-by: default avatarMurali Karicheri <m-karicheri2@ti.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
[lorenzo.pieralisi@arm.com: updated commit subject]
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d95c4fa
...@@ -181,7 +181,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie, ...@@ -181,7 +181,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
} }
/* interrupt controller is in a child node */ /* interrupt controller is in a child node */
*np_temp = of_find_node_by_name(np_pcie, controller); *np_temp = of_get_child_by_name(np_pcie, controller);
if (!(*np_temp)) { if (!(*np_temp)) {
dev_err(dev, "Node for %s is absent\n", controller); dev_err(dev, "Node for %s is absent\n", controller);
return -EINVAL; return -EINVAL;
...@@ -190,6 +190,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie, ...@@ -190,6 +190,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
temp = of_irq_count(*np_temp); temp = of_irq_count(*np_temp);
if (!temp) { if (!temp) {
dev_err(dev, "No IRQ entries in %s\n", controller); dev_err(dev, "No IRQ entries in %s\n", controller);
of_node_put(*np_temp);
return -EINVAL; return -EINVAL;
} }
...@@ -207,6 +208,8 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie, ...@@ -207,6 +208,8 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
break; break;
} }
of_node_put(*np_temp);
if (temp) { if (temp) {
*num_irqs = temp; *num_irqs = temp;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment