From: Linus Walleij <linus.walleij@linaro.org>
To: linux-gpio@vger.kernel.org
Cc: "Bartosz Golaszewski" <bgolaszewski@baylibre.com>,
"Linus Walleij" <linus.walleij@linaro.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Subject: [PATCH 1/5] gpio: siox: Do not call gpiochip_remove() on errorpath
Date: Wed, 26 Jun 2019 10:44:03 +0200 [thread overview]
Message-ID: <20190626084407.27976-1-linus.walleij@linaro.org> (raw)
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.
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/gpio/gpio-siox.c | 7 ++-----
1 file 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;
}
--
2.20.1
next reply other threads:[~2019-06-26 8:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-26 8:44 Linus Walleij [this message]
2019-06-26 8:44 ` [PATCH 2/5] gpio: siox: Switch to IRQ_TYPE_NONE Linus Walleij
2019-06-26 9:12 ` Uwe Kleine-König
2019-06-26 8:44 ` [PATCH 3/5] gpio: siox: Pass irqchip when adding gpiochip Linus Walleij
2019-06-26 9:16 ` Uwe Kleine-König
2019-06-26 8:44 ` [PATCH 4/5] gpio: siox: Add struct device *dev helper variable Linus Walleij
2019-06-26 9:13 ` Uwe Kleine-König
2019-06-26 8:44 ` [PATCH 5/5] gpio: siox: Use devm_ managed gpiochip Linus Walleij
2019-06-26 9:14 ` Uwe Kleine-König
2019-06-26 9:12 ` [PATCH 1/5] gpio: siox: Do not call gpiochip_remove() on errorpath Uwe Kleine-König
2019-06-26 11:49 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190626084407.27976-1-linus.walleij@linaro.org \
--to=linus.walleij@linaro.org \
--cc=bgolaszewski@baylibre.com \
--cc=linux-gpio@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).