summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2019-06-26 10:09:00 +0200
committerLinus Walleij <linus.walleij@linaro.org>2019-06-27 16:56:52 +0200
commit4c0a8899d9c215633ef79805c68b2566c775d43d (patch)
tree699712e9c7161cf7d2fb6f2212a9f55b87932bd8
parentgpio: pl061: Pass irqchip when adding gpiochip (diff)
downloadlinux-4c0a8899d9c215633ef79805c68b2566c775d43d.tar.xz
linux-4c0a8899d9c215633ef79805c68b2566c775d43d.zip
gpio: siox: Do not call gpiochip_remove() on errorpath
gpiochip_remove() was called on the errorpath if gpiochip_add() failed: this is wrong, if the chip failed to add it is not there so it should not be removed. Fixes: be8c8facc707 ("gpio: new driver to work with a 8x12 siox") Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpio-siox.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpio/gpio-siox.c b/drivers/gpio/gpio-siox.c
index fb4e318ab028..0b4450118865 100644
--- a/drivers/gpio/gpio-siox.c
+++ b/drivers/gpio/gpio-siox.c
@@ -243,17 +243,14 @@ static int gpio_siox_probe(struct siox_device *sdevice)
if (ret) {
dev_err(&sdevice->dev,
"Failed to register gpio chip (%d)\n", ret);
- goto err_gpiochip;
+ return ret;
}
ret = gpiochip_irqchip_add(&ddata->gchip, &ddata->ichip,
0, handle_level_irq, IRQ_TYPE_EDGE_RISING);
- if (ret) {
+ if (ret)
dev_err(&sdevice->dev,
"Failed to register irq chip (%d)\n", ret);
-err_gpiochip:
- gpiochip_remove(&ddata->gchip);
- }
return ret;
}