Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / arch / mips / ralink / irq.c

diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c
index f0442990aa358c9d49c8b8c5a38ce53c6c339810..53707aacc0f86cb13134546de07ccaf71d76321d 100644 (file)
--- a/arch/mips/ralink/irq.c
+++ b/arch/mips/ralink/irq.c
@@ -100,7 +100,7 @@ static void ralink_intc_irq_handler(unsigned int irq, struct irq_desc *desc)
        u32 pending = rt_intc_r32(INTC_REG_STATUS0);
 
        if (pending) {
-               struct irq_domain *domain = irq_get_handler_data(irq);
+               struct irq_domain *domain = irq_desc_get_handler_data(desc);
                generic_handle_irq(irq_find_mapping(domain, __ffs(pending)));
        } else {
                spurious_interrupt();