1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 3b54edf2befe..c68d037de656 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -413,12 +413,12 @@ void gpiochip_set_chained_irqchip(struct gpio_chip *gpiochip,
                 return;
         }
 
-        irq_set_chained_handler(parent_irq, parent_handler);
         /*
          * The parent irqchip is already using the chip_data for this
          * irqchip, so our callbacks simply use the handler_data.
          */
         irq_set_handler_data(parent_irq, gpiochip);
+        irq_set_chained_handler(parent_irq, parent_handler);
 }
 EXPORT_SYMBOL_GPL(gpiochip_set_chained_irqchip);