Merge branch 'fixes-rc1' into omap-for-v4.2/fixes

[karo-tx-linux.git] / drivers / gpio / gpio-dwapb.c

diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 58faf04fce5da02067d6706378ed6c1ca1feef33..55fa9853a7f2207984c0e99d3e1cee2c49ad788d 100644 (file)
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -348,8 +348,8 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
        irq_gc->chip_types[1].handler = handle_edge_irq;
 
        if (!pp->irq_shared) {
-               irq_set_chained_handler(pp->irq, dwapb_irq_handler);
-               irq_set_handler_data(pp->irq, gpio);
+               irq_set_chained_handler_and_data(pp->irq, dwapb_irq_handler,
+                                                gpio);
        } else {
                /*
                 * Request a shared IRQ since where MFD would have devices