From: Yang Yingliang <yangyingliang@huawei.com>
To: <linux-gpio@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <linus.walleij@linaro.org>, <p.zabel@pengutronix.de>,
<horatiu.vultur@microchip.com>
Subject: [PATCH -next v2 1/2] pinctrl: ocelot: add missing destroy_workqueue() in error path in ocelot_pinctrl_probe()
Date: Sat, 17 Sep 2022 10:46:33 +0800 [thread overview]
Message-ID: <20220917024634.1021861-1-yangyingliang@huawei.com> (raw)
Add the missing destroy_workqueue() before return from ocelot_pinctrl_probe()
in error path.
Fixes: c297561bc98a ("pinctrl: ocelot: Fix interrupt controller")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
v2:
move alloc_ordered_workqueue() after ocelot_pinctrl_register().
---
drivers/pinctrl/pinctrl-ocelot.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c
index d9c0184c077f..c672bc2a4df5 100644
--- a/drivers/pinctrl/pinctrl-ocelot.c
+++ b/drivers/pinctrl/pinctrl-ocelot.c
@@ -2065,10 +2065,6 @@ static int ocelot_pinctrl_probe(struct platform_device *pdev)
if (!info->desc)
return -ENOMEM;
- info->wq = alloc_ordered_workqueue("ocelot_ordered", 0);
- if (!info->wq)
- return -ENOMEM;
-
info->pincfg_data = &data->pincfg_data;
reset = devm_reset_control_get_optional_shared(dev, "switch");
@@ -2107,9 +2103,15 @@ static int ocelot_pinctrl_probe(struct platform_device *pdev)
if (ret)
return ret;
+ info->wq = alloc_ordered_workqueue("ocelot_ordered", 0);
+ if (!info->wq)
+ return -ENOMEM;
+
ret = ocelot_gpiochip_register(pdev, info);
- if (ret)
+ if (ret) {
+ destroy_workqueue(info->wq);
return ret;
+ }
dev_info(dev, "driver registered\n");
--
2.25.1
next reply other threads:[~2022-09-17 2:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-17 2:46 Yang Yingliang [this message]
2022-09-17 2:46 ` [PATCH -next v2 2/2] pinctrl: ocelot: Use devm_platform_get_and_ioremap_resource() Yang Yingliang
2022-09-17 8:55 ` andy.shevchenko
2022-09-17 8:54 ` [PATCH -next v2 1/2] pinctrl: ocelot: add missing destroy_workqueue() in error path in ocelot_pinctrl_probe() andy.shevchenko
2022-09-17 11:19 ` Yang Yingliang
2022-10-04 7:09 ` Linus Walleij
2022-10-04 9:11 ` Horatiu Vultur
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=20220917024634.1021861-1-yangyingliang@huawei.com \
--to=yangyingliang@huawei.com \
--cc=horatiu.vultur@microchip.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=p.zabel@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
all inboxes | Powered by JetHome®