| From d93ebdd868193260e66b57f6f34fc3ad63505b00 Mon Sep 17 00:00:00 2001 |
| From: Paul Cercueil <paul@crapouillou.net> |
| Date: Wed, 2 Oct 2019 19:25:22 +0800 |
| Subject: [PATCH] irqchip: ingenic: Error out if IRQ domain creation failed |
| |
| commit 52ecc87642f273a599c9913b29fd179c13de457b upstream. |
| |
| If we cannot create the IRQ domain, the driver should fail to probe |
| instead of succeeding with just a warning message. |
| |
| Signed-off-by: Paul Cercueil <paul@crapouillou.net> |
| Signed-off-by: Marc Zyngier <maz@kernel.org> |
| Link: https://lore.kernel.org/r/1570015525-27018-3-git-send-email-zhouyanjie@zoho.com |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/irqchip/irq-ingenic.c b/drivers/irqchip/irq-ingenic.c |
| index f126255b3260..dda512dfe2c1 100644 |
| --- a/drivers/irqchip/irq-ingenic.c |
| +++ b/drivers/irqchip/irq-ingenic.c |
| @@ -108,6 +108,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) + |
| @@ -134,14 +142,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: |
| -- |
| 2.7.4 |
| |