Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4c2250c authored by Paul Cercueil's avatar Paul Cercueil Committed by Greg Kroah-Hartman
Browse files

irqchip: ingenic: Error out if IRQ domain creation failed 



[ Upstream commit 52ecc87642f273a599c9913b29fd179c13de457b ]

If we cannot create the IRQ domain, the driver should fail to probe
instead of succeeding with just a warning message.

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/1570015525-27018-3-git-send-email-zhouyanjie@zoho.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8f5f88c6

drivers/irqchip/irq-ingenic.c

+10 −5
Original line number Diff line number Diff line
@@ -117,6 +117,14 @@ static int __init ingenic_intc_of_init(struct device_node *node, 
		goto out_unmap_irq;

	}



	domain = irq_domain_add_legacy(node, num_chips * 32,

				       JZ4740_IRQ_BASE, 0,

				       &irq_domain_simple_ops, NULL);

	if (!domain) {

		err = -ENOMEM;

		goto out_unmap_base;

	}



	for (i = 0; i < num_chips; i++) {

		/* Mask all irqs */

		writel(0xffffffff, intc->base + (i * CHIP_SIZE) +
@@ -143,14 +151,11 @@ static int __init ingenic_intc_of_init(struct device_node *node, 
				       IRQ_NOPROBE | IRQ_LEVEL);

	}



	domain = irq_domain_add_legacy(node, num_chips * 32, JZ4740_IRQ_BASE, 0,

				       &irq_domain_simple_ops, NULL);

	if (!domain)

		pr_warn("unable to register IRQ domain\n");



	setup_irq(parent_irq, &intc_cascade_action);

	return 0;



out_unmap_base:

	iounmap(intc->base);

out_unmap_irq:

	irq_dispose_mapping(parent_irq);

out_free: