gpio: mpc8xxx: Prevent NULL pointer deref in demux handler

commit cfadd83(powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver) added an unconditional call of chip->irq_eoi() to the demux handler. This leads to a NULL pointer derefernce on MPC512x platforms which use this driver as well. Make it conditional. Reported-by: Thomas Wucher <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: Felix Radensky <[email protected]> Cc: Kumar Gala <[email protected]> Cc: Grant Likely <[email protected]> Cc: [email protected] Signed-off-by: Grant Likely <[email protected]>
syzer · May 18, 2012 · d6de85e · d6de85e
1 parent e92935e
commit d6de85e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c
@@ -163,7 +163,8 @@ static void mpc8xxx_gpio_irq_cascade(unsigned int irq, struct irq_desc *desc)
 	if (mask)
 		generic_handle_irq(irq_linear_revmap(mpc8xxx_gc->irq,
 						     32 - ffs(mask)));
-	chip->irq_eoi(&desc->irq_data);
+	if (chip->irq_eoi)
+		chip->irq_eoi(&desc->irq_data);
 }
 
 static void mpc8xxx_irq_unmask(struct irq_data *d)