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

From: Yang Yingliang
Date: Fri Sep 16 2022 - 22:28:29 EST



On 2022/9/17 3:01, Horatiu Vultur wrote:
The 09/15/2022 23:14, Yang Yingliang wrote:

Hi Yang,

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@xxxxxxxxxx>
---
drivers/pinctrl/pinctrl-ocelot.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c
index d9c0184c077f..83703a3d291c 100644
--- a/drivers/pinctrl/pinctrl-ocelot.c
+++ b/drivers/pinctrl/pinctrl-ocelot.c
@@ -2072,15 +2072,19 @@ static int ocelot_pinctrl_probe(struct platform_device *pdev)
info->pincfg_data = &data->pincfg_data;

reset = devm_reset_control_get_optional_shared(dev, "switch");
- if (IS_ERR(reset))
- return dev_err_probe(dev, PTR_ERR(reset),
- "Failed to get reset\n");
+ if (IS_ERR(reset)) {
+ ret = dev_err_probe(dev, PTR_ERR(reset),
+ "Failed to get reset\n");
+ goto err_out;
+ }
reset_control_reset(reset);

base = devm_ioremap_resource(dev,
platform_get_resource(pdev, IORESOURCE_MEM, 0));
- if (IS_ERR(base))
- return PTR_ERR(base);
+ if (IS_ERR(base)) {
+ ret = PTR_ERR(base);
+ goto err_out;
+ }

info->stride = 1 + (info->desc->npins - 1) / 32;

@@ -2089,7 +2093,8 @@ static int ocelot_pinctrl_probe(struct platform_device *pdev)
info->map = devm_regmap_init_mmio(dev, base, &regmap_config);
if (IS_ERR(info->map)) {
dev_err(dev, "Failed to create regmap\n");
- return PTR_ERR(info->map);
+ ret = PTR_ERR(info->map);
+ goto err_out;
}
dev_set_drvdata(dev, info);
info->dev = dev;
@@ -2105,15 +2110,19 @@ static int ocelot_pinctrl_probe(struct platform_device *pdev)

ret = ocelot_pinctrl_register(pdev, info);
if (ret)
- return ret;
+ goto err_out;
Wouldn't be better actually to add the allocation of the workqueue here?
In this way, you will not need all the previous changes.
Yes, thanks.

Yang
ret = ocelot_gpiochip_register(pdev, info);
if (ret)
- return ret;
+ goto err_out;

dev_info(dev, "driver registered\n");

return 0;
+
+err_out:
+ destroy_workqueue(info->wq);
+ return ret;
}

static int ocelot_pinctrl_remove(struct platform_device *pdev)
--
2.25.1