OSDN Git Service

powerpc/8xx: fix mpc8xx_get_irq() return on no irq
authorChristophe Leroy <christophe.leroy@c-s.fr>
Fri, 10 Mar 2017 10:37:01 +0000 (11:37 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 13 Apr 2018 17:48:18 +0000 (19:48 +0200)
[ Upstream commit 3c29b6038828c1f4c9ecbfec14d4fc5e25f1c947 ]

IRQ 0 is a valid HW interrupt. So get_irq() shall return 0 when
there is no irq, instead of returning irq_linear_revmap(... ,0)

Fixes: f2a0bd3753dad ("[POWERPC] 8xx: powerpc port of core CPM PIC")
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/sysdev/mpc8xx_pic.c

index 3e828b2..2842f9d 100644 (file)
@@ -79,7 +79,7 @@ unsigned int mpc8xx_get_irq(void)
        irq = in_be32(&siu_reg->sc_sivec) >> 26;
 
        if (irq == PIC_VEC_SPURRIOUS)
-               irq = 0;
+               return 0;
 
         return irq_linear_revmap(mpc8xx_pic_host, irq);