* [PATCH] pinctrl: stm32: add missing of_node_put
@ 2021-02-15 10:36 angkery
2021-03-02 9:03 ` Linus Walleij
0 siblings, 1 reply; 3+ messages in thread
From: angkery @ 2021-02-15 10:36 UTC (permalink / raw)
To: linus.walleij, mcoquelin.stm32, alexandre.torgue, maz,
etienne.carriere, geert+renesas, matti.vaittinen, fabien.dessenne,
marex
Cc: linux-gpio, linux-stm32, linux-arm-kernel, linux-kernel,
Junlin Yang
From: Junlin Yang <yangjunlin@yulong.com>
Fix OF node leaks by calling of_node_put in
for_each_available_child_of_node when the cycle returns.
Generated by: scripts/coccinelle/iterators/for_each_child.cocci
Signed-off-by: Junlin Yang <yangjunlin@yulong.com>
---
drivers/pinctrl/stm32/pinctrl-stm32.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index 7d9bded..da72e3e 100644
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -1542,8 +1542,10 @@ int stm32_pctl_probe(struct platform_device *pdev)
if (of_property_read_bool(child, "gpio-controller")) {
bank->rstc = of_reset_control_get_exclusive(child,
NULL);
- if (PTR_ERR(bank->rstc) == -EPROBE_DEFER)
+ if (PTR_ERR(bank->rstc) == -EPROBE_DEFER) {
+ of_node_put(child);
return -EPROBE_DEFER;
+ }
bank->clk = of_clk_get_by_name(child, NULL);
if (IS_ERR(bank->clk)) {
@@ -1551,6 +1553,7 @@ int stm32_pctl_probe(struct platform_device *pdev)
dev_err(dev,
"failed to get clk (%ld)\n",
PTR_ERR(bank->clk));
+ of_node_put(child);
return PTR_ERR(bank->clk);
}
i++;
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] pinctrl: stm32: add missing of_node_put
2021-02-15 10:36 [PATCH] pinctrl: stm32: add missing of_node_put angkery
@ 2021-03-02 9:03 ` Linus Walleij
0 siblings, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2021-03-02 9:03 UTC (permalink / raw)
To: angkery
Cc: Maxime Coquelin, Alexandre TORGUE, Marc Zyngier, Etienne Carriere,
Geert Uytterhoeven, Matti Vaittinen, Fabien Dessenne, Marek Vasut,
open list:GPIO SUBSYSTEM, linux-stm32, Linux ARM,
linux-kernel@vger.kernel.org, Junlin Yang
On Mon, Feb 15, 2021 at 11:41 AM angkery <angkery@163.com> wrote:
> From: Junlin Yang <yangjunlin@yulong.com>
>
> Fix OF node leaks by calling of_node_put in
> for_each_available_child_of_node when the cycle returns.
>
> Generated by: scripts/coccinelle/iterators/for_each_child.cocci
>
> Signed-off-by: Junlin Yang <yangjunlin@yulong.com>
Patch applied with Fabien's ACK!
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <4a576fb8-682e-d1af-777d-436f9bc53794@foss.st.com>]
* Re: [PATCH] pinctrl: stm32: add missing of_node_put
[not found] <4a576fb8-682e-d1af-777d-436f9bc53794@foss.st.com>
@ 2021-02-15 13:56 ` foss
0 siblings, 0 replies; 3+ messages in thread
From: foss @ 2021-02-15 13:56 UTC (permalink / raw)
To: angkery, linus.walleij, Maxime Coquelin, Alexandre TORGUE-SCND-02,
maz, Etienne CARRIERE-SCND-01, geert+renesas, matti.vaittinen,
marex
Cc: linux-gpio, linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, yangjunlin
Resending in plain-text format.
On 15/02/2021 2:26 pm, foss wrote:
>
> Hi Junlin
>
>
> Thank you for the patch!
>
>
> Fabien
>
>
>> From: Junlin Yang<yangjunlin@yulong.com>
>>
>> Fix OF node leaks by calling of_node_put in for_each_available_child_of_node when the cycle returns.
>>
>> Generated by: scripts/coccinelle/iterators/for_each_child.cocci
>>
>> Signed-off-by: Junlin Yang<yangjunlin@yulong.com>
>
> Acked-by: Fabien Dessenne <fabien.dessenne@foss.st.com>
>
>
>> ---
>> drivers/pinctrl/stm32/pinctrl-stm32.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
>> index 7d9bded..da72e3e 100644
>> --- a/drivers/pinctrl/stm32/pinctrl-stm32.c
>> +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
>> @@ -1542,8 +1542,10 @@ int stm32_pctl_probe(struct platform_device *pdev)
>> if (of_property_read_bool(child, "gpio-controller")) {
>> bank->rstc = of_reset_control_get_exclusive(child,
>> NULL);
>> - if (PTR_ERR(bank->rstc) == -EPROBE_DEFER)
>> + if (PTR_ERR(bank->rstc) == -EPROBE_DEFER) {
>> + of_node_put(child);
>> return -EPROBE_DEFER;
>> + }
>>
>> bank->clk = of_clk_get_by_name(child, NULL);
>> if (IS_ERR(bank->clk)) {
>> @@ -1551,6 +1553,7 @@ int stm32_pctl_probe(struct platform_device *pdev)
>> dev_err(dev,
>> "failed to get clk (%ld)\n",
>> PTR_ERR(bank->clk));
>> + of_node_put(child);
>> return PTR_ERR(bank->clk);
>> }
>> i++;
>> --
>> 1.9.1
>>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-02 21:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-15 10:36 [PATCH] pinctrl: stm32: add missing of_node_put angkery
2021-03-02 9:03 ` Linus Walleij
[not found] <4a576fb8-682e-d1af-777d-436f9bc53794@foss.st.com>
2021-02-15 13:56 ` foss
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).