diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-10-10 14:23:26 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-10-10 14:23:26 +0300 |
| commit | dde5cfffd68a755151caf449b3870e4120cbc9c7 (patch) | |
| tree | c5d03961d90d8337f14da425372af47e58f15a12 /drivers/irqchip/irq-ti-sci-intr.c | |
| parent | 408f110ef6974b336cc0958bf123f5234f583869 (diff) | |
| parent | 1d1e5630de78f7253ac24b92cee6427c3ff04d56 (diff) | |
| download | linux-dde5cfffd68a755151caf449b3870e4120cbc9c7.tar.xz | |
Merge branch 'irq/irqchip-fixes' into irq/irqchip-next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'drivers/irqchip/irq-ti-sci-intr.c')
| -rw-r--r-- | drivers/irqchip/irq-ti-sci-intr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-ti-sci-intr.c b/drivers/irqchip/irq-ti-sci-intr.c index 6a6fb6616c21..ac9d6d658e65 100644 --- a/drivers/irqchip/irq-ti-sci-intr.c +++ b/drivers/irqchip/irq-ti-sci-intr.c @@ -137,8 +137,8 @@ static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain, struct ti_sci_intr_irq_domain *intr = domain->host_data; struct device_node *parent_node; struct irq_fwspec fwspec; - u16 out_irq, p_hwirq; - int err = 0; + int p_hwirq, err = 0; + u16 out_irq; out_irq = ti_sci_get_free_resource(intr->out_irqs); if (out_irq == TI_SCI_RESOURCE_NULL) |