Commit 5f61c693 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

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: default avatarMarc Zyngier <maz@kernel.org>
parents 6360ec8f 02298b7b

drivers/irqchip/irq-alpine-msi.c

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv, 
	}



	gic_domain = irq_find_host(gic_node);

	of_node_put(gic_node);

	if (!gic_domain) {

		pr_err("Failed to find the GIC domain\n");

		return -ENXIO;

drivers/irqchip/irq-mvebu-gicp.c

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ static int mvebu_gicp_probe(struct platform_device *pdev) 
	}



	parent_domain = irq_find_host(irq_parent_dn);

	of_node_put(irq_parent_dn);

	if (!parent_domain) {

		dev_err(&pdev->dev, "failed to find parent IRQ domain\n");

		return -ENODEV;

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

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev) 
	}



	parent_domain = irq_find_host(parent_node);

	of_node_put(parent_node);

	if (!parent_domain) {

		dev_err(dev, "Failed to find IRQ parent domain\n");

		return -ENODEV;

drivers/irqchip/irqchip.c

+6 −2
Original line number Diff line number Diff line
@@ -38,8 +38,10 @@ int platform_irqchip_probe(struct platform_device *pdev) 
	struct device_node *par_np = of_irq_find_parent(np);

	of_irq_init_cb_t irq_init_cb = of_device_get_match_data(&pdev->dev);



	if (!irq_init_cb)

	if (!irq_init_cb) {

		of_node_put(par_np);

		return -EINVAL;

	}



	if (par_np == np)

		par_np = NULL;
@@ -52,8 +54,10 @@ int platform_irqchip_probe(struct platform_device *pdev) 
	 * interrupt controller. The actual initialization callback of this

	 * interrupt controller can check for specific domains as necessary.

	 */

	if (par_np && !irq_find_matching_host(par_np, DOMAIN_BUS_ANY))

	if (par_np && !irq_find_matching_host(par_np, DOMAIN_BUS_ANY)) {

		of_node_put(par_np);

		return -EPROBE_DEFER;

	}



	return irq_init_cb(np, par_np);

}