gpio: gpio-mxs: Fix race in installing chained IRQ handler

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

diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
index 84cbda6..eac8727 100644 (file)
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
@@ -320,8 +320,8 @@ static int mxs_gpio_probe(struct platform_device *pdev)
        mxs_gpio_init_gc(port, irq_base);
 
        /* setup one handler for each entry */
-       irq_set_chained_handler(port->irq, mxs_gpio_irq_handler);
-       irq_set_handler_data(port->irq, port);
+       irq_set_chained_handler_and_data(port->irq, mxs_gpio_irq_handler,
+                                        port);
 
        err = bgpio_init(&port->bgc, &pdev->dev, 4,
                         port->base + PINCTRL_DIN(port),