diff mbox series

[-next,v2,1/2] pinctrl: ocelot: add missing destroy_workqueue() in error path in ocelot_pinctrl_probe()

Message ID 20220917024634.1021861-1-yangyingliang@huawei.com
State New
Headers show
Series [-next,v2,1/2] pinctrl: ocelot: add missing destroy_workqueue() in error path in ocelot_pinctrl_probe() | expand

Commit Message

Yang Yingliang Sept. 17, 2022, 2:46 a.m. UTC
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(-)

Comments

Linus Walleij Oct. 4, 2022, 7:09 a.m. UTC | #1
On Sat, Sep 17, 2022 at 4:39 AM Yang Yingliang <yangyingliang@huawei.com> wrote:

> 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().

Horatiu does this v2 look like you want it? Reviewed-by?

Yours,
Linus Walleij
Horatiu Vultur Oct. 4, 2022, 9:11 a.m. UTC | #2
The 10/04/2022 09:09, Linus Walleij wrote:

Hi Linus,

> 
> On Sat, Sep 17, 2022 at 4:39 AM Yang Yingliang <yangyingliang@huawei.com> wrote:
> 
> > 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().
> 
> Horatiu does this v2 look like you want it? Reviewed-by?

I have noticed that Yang has sent another version (v3)[1] where he makes
uses of devm_add_action_or_reset.

[1] https://lore.kernel.org/all/20220925021258.1492905-1-yangyingliang@huawei.com/T/

> 
> Yours,
> Linus Walleij
diff mbox series

Patch

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");