The following commit has been merged into the irq/core branch of tip:

Commit-ID:     8ddf1905a904ca86d71ca1c435e4b0b2a0b70df8
Gitweb:        
https://git.kernel.org/tip/8ddf1905a904ca86d71ca1c435e4b0b2a0b70df8
Author:        YueHaibing <yuehaib...@huawei.com>
AuthorDate:    Wed, 26 Aug 2020 11:53:21 +08:00
Committer:     Marc Zyngier <m...@kernel.org>
CommitterDate: Sun, 13 Sep 2020 15:30:00 +01:00

irqchip/ti-sci-intr: Fix unsigned comparison to zero

ti_sci_intr_xlate_irq() return -ENOENT on fail, p_hwirq
should be int type.

Fixes: a5b659bd4bc7 ("irqchip/ti-sci-intr: Add support for INTR being a parent 
to INTR")
Signed-off-by: YueHaibing <yuehaib...@huawei.com>
Signed-off-by: Marc Zyngier <m...@kernel.org>
Acked-by: Lokesh Vutla <lokeshvu...@ti.com>
Link: https://lore.kernel.org/r/20200826035321.18620-1-yuehaib...@huawei.com
---
 drivers/irqchip/irq-ti-sci-intr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/irqchip/irq-ti-sci-intr.c 
b/drivers/irqchip/irq-ti-sci-intr.c
index cbc1758..85a72b5 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)

Reply via email to