From: Jiale Yao <yaojiale02@163.com>
To: Geert Uytterhoeven <geert+renesas@glider.be>,
Linus Walleij <linusw@kernel.org>,
linux-renesas-soc@vger.kernel.org, linux-gpio@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Jiale Yao <yaojiale02@163.com>
Subject: [PATCH v2 2/4] pinctrl: renesas: rzn1: free maps on DT map failure
Date: Sat, 3 Oct 2026 16:31:55 +0800 [thread overview]
Message-ID: <20261003083200.459705-3-yaojiale02@163.com> (raw)
In-Reply-To: <20261003083200.459705-1-yaojiale02@163.com>
rzn1_dt_node_to_map_one() appends mappings for each DT node. If a
node fails after map storage has been reserved, the top-level callback
returns without releasing mappings built for the current and previous
nodes.
Free the accumulated map on every error path. The caller ignores the
output parameters when the mapping callback returns an error, so they do
not need to be reset after freeing the map.
Signed-off-by: Jiale Yao <yaojiale02@163.com>
---
drivers/pinctrl/renesas/pinctrl-rzn1.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/pinctrl/renesas/pinctrl-rzn1.c b/drivers/pinctrl/renesas/pinctrl-rzn1.c
index fb874867dbfb..64a89e307191 100644
--- a/drivers/pinctrl/renesas/pinctrl-rzn1.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzn1.c
@@ -411,15 +411,19 @@ static int rzn1_dt_node_to_map(struct pinctrl_dev *pctldev,
ret = rzn1_dt_node_to_map_one(pctldev, np, map, num_maps);
if (ret < 0)
- return ret;
+ goto err_free_map;
for_each_child_of_node_scoped(np, child) {
ret = rzn1_dt_node_to_map_one(pctldev, child, map, num_maps);
if (ret < 0)
- return ret;
+ goto err_free_map;
}
return 0;
+
+err_free_map:
+ pinctrl_utils_free_map(pctldev, *map, *num_maps);
+ return ret;
}
static const struct pinctrl_ops rzn1_pctrl_ops = {
--
2.34.1
next prev parent reply other threads:[~2026-10-03 8:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-03 8:31 [PATCH v2 0/4] pinctrl: free maps on DT mapping failures Jiale Yao
2026-10-03 8:31 ` [PATCH v2 1/4] pinctrl: sprd: free maps on DT map failure Jiale Yao
2026-10-03 8:31 ` Jiale Yao [this message]
2026-10-03 8:31 ` [PATCH v2 3/4] pinctrl: tegra: xusb: " Jiale Yao
2026-10-03 8:31 ` [PATCH v2 4/4] pinctrl: samsung: " Jiale Yao
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=20261003083200.459705-3-yaojiale02@163.com \
--to=yaojiale02@163.com \
--cc=geert+renesas@glider.be \
--cc=linusw@kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
/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®