1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index cc7bfc3428c8..70344cc75743 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -138,8 +138,8 @@ static void __init pxa_init_low_gpio_irq(set_wake_t fn)
 
         for (irq = IRQ_GPIO0; irq <= IRQ_GPIO1; irq++) {
                 irq_set_chip(irq, &pxa_low_gpio_chip);
-                irq_set_chip_data(irq, irq_base(0));
                 irq_set_handler(irq, handle_edge_irq);
+                irq_set_chip_data(irq, irq_base(0));
                 set_irq_flags(irq, IRQF_VALID);
         }
 
@@ -166,8 +166,8 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
 
                         irq = PXA_IRQ(i);
                         irq_set_chip(irq, &pxa_internal_irq_chip);
-                        irq_set_chip_data(irq, base);
                         irq_set_handler(irq, handle_level_irq);
+                        irq_set_chip_data(irq, base);
                         set_irq_flags(irq, IRQF_VALID);
                 }
         }