1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 686be4b73018..c94da688ee9b 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -880,8 +880,8 @@ irq_set_chained_handler_and_data(unsigned int irq, irq_flow_handler_t handle,
         if (!desc)
                 return;
 
-        __irq_do_set_handler(desc, handle, 1, NULL);
         desc->irq_common_data.handler_data = data;
+        __irq_do_set_handler(desc, handle, 1, NULL);
 
         irq_put_desc_busunlock(desc, flags);
 }