Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinctrl-adi2.c

diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c
index 873433da0f2ce192651aa9003946399d16e82a0f..c3c3d2345fc6b23b4364d952e75d8887772f7221 100644 (file)
--- a/drivers/pinctrl/pinctrl-adi2.c
+++ b/drivers/pinctrl/pinctrl-adi2.c
@@ -865,8 +865,8 @@ static int adi_gpio_pint_probe(struct platform_device *pdev)
        pint->pint_map_port = adi_pint_map_port;
        platform_set_drvdata(pdev, pint);
 
-       irq_set_chained_handler(pint->irq, adi_gpio_handle_pint_irq);
-       irq_set_handler_data(pint->irq, pint);
+       irq_set_chained_handler_and_data(pint->irq, adi_gpio_handle_pint_irq,
+                                        pint);
 
        list_add_tail(&pint->node, &adi_pint_list);