Merge tag 'nfs-for-4.3-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[cascardo/linux.git] / drivers / gpio / gpio-tz1090.c

diff --git a/drivers/gpio/gpio-tz1090.c b/drivers/gpio/gpio-tz1090.c
index 445660a..bbac92a 100644 (file)
--- a/drivers/gpio/gpio-tz1090.c
+++ b/drivers/gpio/gpio-tz1090.c
@@ -510,8 +510,8 @@ static int tz1090_gpio_bank_probe(struct tz1090_gpio_bank_info *info)
        gc->chip_types[1].chip.flags            = IRQCHIP_MASK_ON_SUSPEND;
 
        /* Setup chained handler for this GPIO bank */
-       irq_set_handler_data(bank->irq, bank);
-       irq_set_chained_handler(bank->irq, tz1090_gpio_irq_handler);
+       irq_set_chained_handler_and_data(bank->irq, tz1090_gpio_irq_handler,
+                                        bank);
 
        return 0;
 }