[PATCH 01/10] pinctrl: nuvoton: ma35: Unmap reg_base and release clock on probe error
From: Lee Jones
Date: Wed Nov 11 2026 - 16:54:42 EST
ma35_get_bank_data() maps bank->reg_base via fwnode_iomap() and acquires
and enables bank->clk via of_clk_get() and clk_prepare_enable(), neither
of which is devres-managed. If of_clk_get() or clk_prepare_enable()
fails, bank->reg_base is leaked, and ma35_pinctrl_get_soc_data() ignores
the error and continues probing with an uninitialised bank.
Register devm cleanup actions for bank->reg_base and bank->clk, and
propagate errors from ma35_get_bank_data() in ma35_pinctrl_get_soc_data().
Fixes: f805e356313b ("pinctrl: nuvoton: Add ma35d1 pinctrl and GPIO driver")
Closes: https://sashiko.dev/#/bug/linux-2046e6c6-45d1-42d4-ae9f-27fac33b07e7
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Lee Jones <lee@xxxxxxxxxx>
---
drivers/pinctrl/nuvoton/pinctrl-ma35.c | 36 ++++++++++++++++++++++----
1 file changed, 31 insertions(+), 5 deletions(-)
diff --git a/drivers/pinctrl/nuvoton/pinctrl-ma35.c b/drivers/pinctrl/nuvoton/pinctrl-ma35.c
index a79ebf4be2c3..408927ab19da 100644
--- a/drivers/pinctrl/nuvoton/pinctrl-ma35.c
+++ b/drivers/pinctrl/nuvoton/pinctrl-ma35.c
@@ -555,6 +555,22 @@ static int ma35_gpiolib_register(struct platform_device *pdev, struct ma35_pinct
return 0;
}
+static void ma35_bank_iounmap(void *data)
+{
+ struct ma35_pin_bank *bank = data;
+
+ iounmap(bank->reg_base);
+ bank->reg_base = NULL;
+}
+
+static void ma35_bank_clk_release(void *data)
+{
+ struct ma35_pin_bank *bank = data;
+
+ clk_disable_unprepare(bank->clk);
+ clk_put(bank->clk);
+}
+
static int ma35_get_bank_data(struct ma35_pin_bank *bank)
{
int ret;
@@ -563,6 +579,10 @@ static int ma35_get_bank_data(struct ma35_pin_bank *bank)
if (!bank->reg_base)
return -ENOMEM;
+ ret = devm_add_action_or_reset(bank->dev, ma35_bank_iounmap, bank);
+ if (ret)
+ return ret;
+
bank->irq = fwnode_irq_get(bank->fwnode, 0);
bank->nr_pins = MA35_GPIO_PORT_MAX;
@@ -572,10 +592,12 @@ static int ma35_get_bank_data(struct ma35_pin_bank *bank)
return PTR_ERR(bank->clk);
ret = clk_prepare_enable(bank->clk);
- if (ret)
+ if (ret) {
clk_put(bank->clk);
+ return ret;
+ }
- return ret;
+ return devm_add_action_or_reset(bank->dev, ma35_bank_clk_release, bank);
}
static int ma35_pinctrl_get_soc_data(struct ma35_pinctrl *pctl, struct platform_device *pdev)
@@ -583,7 +605,7 @@ static int ma35_pinctrl_get_soc_data(struct ma35_pinctrl *pctl, struct platform_
struct fwnode_handle *child;
struct ma35_pin_ctrl *ctrl;
struct ma35_pin_bank *bank;
- int i, id = 0;
+ int i, id = 0, ret;
ctrl = pctl->ctrl;
ctrl->nr_banks = MA35_GPIO_BANK_MAX;
@@ -603,8 +625,12 @@ static int ma35_pinctrl_get_soc_data(struct ma35_pinctrl *pctl, struct platform_
bank->fwnode = child;
bank->regmap = pctl->regmap;
bank->dev = &pdev->dev;
- if (!ma35_get_bank_data(bank))
- bank->valid = true;
+ ret = ma35_get_bank_data(bank);
+ if (ret) {
+ fwnode_handle_put(child);
+ return ret;
+ }
+ bank->valid = true;
id++;
}
return 0;
--
2.56.0.567.gdb80ae8cd5-goog