mfd: fix the asic3 irq demux code

Wrong irq numbers were given to desc->handle_irq, which on some devices
caused endless loops (asic3_irq_demux calling itself, basically).

Signed-off-by: Philipp Zabel <[email protected]>
Signed-off-by: Samuel Ortiz <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>

diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 50c773c4d60adf34582b84cffc82a9690bc41542..f2fb233b0ff35b8027d3b0090fdd1324d0d4e971 100644 (file)
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -137,7 +137,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
                for (i = ASIC3_NUM_GPIOS; i < ASIC3_NR_IRQS; i++) {
                        /* They start at bit 4 and go up */
                        if (status & (1 << (i - ASIC3_NUM_GPIOS + 4))) {
-                               desc = irq_desc +  + i;
+                               desc = irq_desc + asic->irq_base + i;
                                desc->handle_irq(asic->irq_base + i,
                                                 desc);
                        }