Merge branch 'linus' into x86/memory-corruption-check

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/arm/mach-iop13xx/msi.c b/arch/arm/mach-iop13xx/msi.c
index 63ef1124ca5c..f34b0ed80630 100644
--- a/arch/arm/mach-iop13xx/msi.c
+++ b/arch/arm/mach-iop13xx/msi.c
@@ -110,8 +110,7 @@ static void iop13xx_msi_handler(unsigned int irq, struct irq_desc *desc)
                 do {
                         j = find_first_bit(&status, 32);
                         (write_imipr[i])(1 << j); /* write back to clear bit */
-                        desc = irq_desc + IRQ_IOP13XX_MSI_0 + j + (32*i);
-                        desc_handle_irq(IRQ_IOP13XX_MSI_0 + j + (32*i), desc);
+                        generic_handle_irq(IRQ_IOP13XX_MSI_0 + j + (32*i));
                         status = (read_imipr[i])();
                 } while (status);
         }