X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Firqchip%2Firq-i8259.c;h=6b304eb39bd22c96b64c6a99629ef4195db721b5;hb=f2115faaf0df42623638dfbfc5bdaab6ef7375ab;hp=e484fd2553210f55fd0eb72375f4ada1511c7fec;hpb=dc5bc3f1e3d886ce1193281bb2bfb2b44f4aeae4;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/irqchip/irq-i8259.c b/drivers/irqchip/irq-i8259.c
index e484fd255321..6b304eb39bd2 100644
--- a/drivers/irqchip/irq-i8259.c
+++ b/drivers/irqchip/irq-i8259.c
@@ -377,8 +377,8 @@ int __init i8259_of_init(struct device_node *node, struct device_node *parent)
 	}
 
 	domain = __init_i8259_irqs(node);
-	irq_set_handler_data(parent_irq, domain);
-	irq_set_chained_handler(parent_irq, i8259_irq_dispatch);
+	irq_set_chained_handler_and_data(parent_irq, i8259_irq_dispatch,
+					 domain);
 	return 0;
 }
 IRQCHIP_DECLARE(i8259, "intel,i8259", i8259_of_init);