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

Fix a race where a pending interrupt could be received and the handler
called before the handler's data has been setup, by converting to
irq_set_chained_handler_and_data().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/E1Z4z0C-0002SX-Lj@rmk-PC.arm.linux.org.uk
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 9f7446a..e4f42c9 100644 (file)
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -437,14 +437,13 @@ static int mxc_gpio_probe(struct platform_device *pdev)
                irq_set_chained_handler(port->irq, mx2_gpio_irq_handler);
        } else {
                /* setup one handler for each entry */
-               irq_set_chained_handler(port->irq, mx3_gpio_irq_handler);
-               irq_set_handler_data(port->irq, port);
-               if (port->irq_high > 0) {
+               irq_set_chained_handler_and_data(port->irq,
+                                                mx3_gpio_irq_handler, port);
+               if (port->irq_high > 0)
                        /* setup handler for GPIO 16 to 31 */
-                       irq_set_chained_handler(port->irq_high,
-                                               mx3_gpio_irq_handler);
-                       irq_set_handler_data(port->irq_high, port);
-               }
+                       irq_set_chained_handler_and_data(port->irq_high,
+                                                        mx3_gpio_irq_handler,
+                                                        port);
        }
 
        err = bgpio_init(&port->bgc, &pdev->dev, 4,