Skip to content

Commit 5f61c69

Browse files
author
Marc Zyngier
committed
Merge branch irq/refcount into irq/irqchip-next
* irq/refcount: : . : Set of OF refcount fixes from Miaoqian Lin, adding an : of_node_put() call after of_irq_find_parent() calls. : . irqchip/ti-sci: Fix refcount leak in ti_sci_intr_irq_domain_probe irqchip/irq-mvebu-gicp: Fix refcount leak in mvebu_gicp_probe irqchip/alpine-msi: Fix refcount leak in alpine_msix_init_domains irqchip: Fix refcount leak in platform_irqchip_probe Signed-off-by: Marc Zyngier <[email protected]>
2 parents 6360ec8 + 02298b7 commit 5f61c69

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

drivers/irqchip/irq-alpine-msi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,
199199
}
200200

201201
gic_domain = irq_find_host(gic_node);
202+
of_node_put(gic_node);
202203
if (!gic_domain) {
203204
pr_err("Failed to find the GIC domain\n");
204205
return -ENXIO;

drivers/irqchip/irq-mvebu-gicp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ static int mvebu_gicp_probe(struct platform_device *pdev)
221221
}
222222

223223
parent_domain = irq_find_host(irq_parent_dn);
224+
of_node_put(irq_parent_dn);
224225
if (!parent_domain) {
225226
dev_err(&pdev->dev, "failed to find parent IRQ domain\n");
226227
return -ENODEV;

drivers/irqchip/irq-ti-sci-intr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
236236
}
237237

238238
parent_domain = irq_find_host(parent_node);
239+
of_node_put(parent_node);
239240
if (!parent_domain) {
240241
dev_err(dev, "Failed to find IRQ parent domain\n");
241242
return -ENODEV;

drivers/irqchip/irqchip.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ int platform_irqchip_probe(struct platform_device *pdev)
3838
struct device_node *par_np = of_irq_find_parent(np);
3939
of_irq_init_cb_t irq_init_cb = of_device_get_match_data(&pdev->dev);
4040

41-
if (!irq_init_cb)
41+
if (!irq_init_cb) {
42+
of_node_put(par_np);
4243
return -EINVAL;
44+
}
4345

4446
if (par_np == np)
4547
par_np = NULL;
@@ -52,8 +54,10 @@ int platform_irqchip_probe(struct platform_device *pdev)
5254
* interrupt controller. The actual initialization callback of this
5355
* interrupt controller can check for specific domains as necessary.
5456
*/
55-
if (par_np && !irq_find_matching_host(par_np, DOMAIN_BUS_ANY))
57+
if (par_np && !irq_find_matching_host(par_np, DOMAIN_BUS_ANY)) {
58+
of_node_put(par_np);
5659
return -EPROBE_DEFER;
60+
}
5761

5862
return irq_init_cb(np, par_np);
5963
}

0 commit comments

Comments
 (0)