]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
gpio: adnp: Fix segfault if request_threaded_irq fails
authorLars Poeschel <poeschel@lemonage.de>
Wed, 7 Aug 2013 15:23:58 +0000 (17:23 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 16 Aug 2013 14:53:16 +0000 (16:53 +0200)
In case request_threaded_irq inside adnp_irq_setup fails, the driver
segfaults. This is because irq_domain_remove is called twice with
the same pointer. First time in adnp_irq_setup and then a second time
after leaving adnp_irq_setup in the error path of adnp_i2c_probe
inside adnp_teardown.
This fixes this by removing the call to irq_domain_remove from
adnp_irq_setup.

Signed-off-by: Lars Poeschel <poeschel@lemonage.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-adnp.c

index e60567fc50736904741d0e1a8e70bb19ddf3c743..c0f3fc44ab0eca1957a1bbf192dca1bc6be04291 100644 (file)
@@ -490,15 +490,11 @@ static int adnp_irq_setup(struct adnp *adnp)
        if (err != 0) {
                dev_err(chip->dev, "can't request IRQ#%d: %d\n",
                        adnp->client->irq, err);
-               goto error;
+               return err;
        }
 
        chip->to_irq = adnp_gpio_to_irq;
        return 0;
-
-error:
-       irq_domain_remove(adnp->domain);
-       return err;
 }
 
 static void adnp_irq_teardown(struct adnp *adnp)