Merge branch 'for-4.3/gembird' into for-linus

2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c
index 81f22980b2de..156b790072b4 100644
--- a/drivers/sh/intc/core.c
+++ b/drivers/sh/intc/core.c
@@ -366,8 +366,9 @@ int __init register_intc_controller(struct intc_desc *desc)
 
                         /* redirect this interrupts to the first one */
                         irq_set_chip(irq2, &dummy_irq_chip);
-                        irq_set_chained_handler(irq2, intc_redirect_irq);
-                        irq_set_handler_data(irq2, (void *)irq);
+                        irq_set_chained_handler_and_data(irq2,
+                                                         intc_redirect_irq,
+                                                         (void *)irq);
                 }
         }
 
diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c
index f30ac9354ff2..f5f1b821241a 100644
--- a/drivers/sh/intc/virq.c
+++ b/drivers/sh/intc/virq.c
@@ -243,8 +243,9 @@ restart:
                  */
                 irq_set_nothread(irq);
 
-                irq_set_chained_handler(entry->pirq, intc_virq_handler);
+                /* Set handler data before installing the handler */
                 add_virq_to_pirq(entry->pirq, irq);
+                irq_set_chained_handler(entry->pirq, intc_virq_handler);
 
                 radix_tree_tag_clear(&d->tree, entry->enum_id,
                                      INTC_TAG_VIRQ_NEEDS_ALLOC);