diff options
| author | Lars Poeschel <poeschel@lemonage.de> | 2013-08-07 17:23:58 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-08-16 16:53:16 +0200 |
| commit | 5b21533b767578f9a80f09082e3aae7429c331c3 (patch) | |
| tree | 1853196b83a54f67f123ece40daf76226695fdf8 | |
| parent | b3abebc777015a445a95548aafe2d3a4b116288e (diff) | |
| download | blackbird-op-linux-5b21533b767578f9a80f09082e3aae7429c331c3.tar.gz blackbird-op-linux-5b21533b767578f9a80f09082e3aae7429c331c3.zip | |
gpio: adnp: Fix segfault if request_threaded_irq fails
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>
| -rw-r--r-- | drivers/gpio/gpio-adnp.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c index e60567fc5073..c0f3fc44ab0e 100644 --- a/drivers/gpio/gpio-adnp.c +++ b/drivers/gpio/gpio-adnp.c @@ -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) |
