Early exits from for_each_available_child_of_node() should decrement the
node reference counter. Reported by Coccinelle:
drivers/thermal/imx_sc_thermal.c:93:1-33: WARNING:
Function "for_each_available_child_of_node" should have of_node_put() before return around line 97.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
drivers/thermal/imx_sc_thermal.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/thermal/imx_sc_thermal.c b/drivers/thermal/imx_sc_thermal.c
index b01d28eca7ee..8d76dbfde6a9 100644
--- a/drivers/thermal/imx_sc_thermal.c
+++ b/drivers/thermal/imx_sc_thermal.c
@@ -93,6 +93,7 @@ static int imx_sc_thermal_probe(struct platform_device *pdev)
for_each_available_child_of_node(np, child) {
sensor = devm_kzalloc(&pdev->dev, sizeof(*sensor), GFP_KERNEL);
if (!sensor) {
+ of_node_put(child);
of_node_put(sensor_np);
return -ENOMEM;
}
@@ -104,6 +105,7 @@ static int imx_sc_thermal_probe(struct platform_device *pdev)
dev_err(&pdev->dev,
"failed to get valid sensor resource id: %d\n",
ret);
+ of_node_put(child);
break;
}
@@ -114,6 +116,7 @@ static int imx_sc_thermal_probe(struct platform_device *pdev)
if (IS_ERR(sensor->tzd)) {
dev_err(&pdev->dev, "failed to register thermal zone\n");
ret = PTR_ERR(sensor->tzd);
+ of_node_put(child);
break;
}
--
2.25.1
Early exits from for_each_available_child_of_node() should decrement the
node reference counter. Reported by Coccinelle:
drivers/thermal/sprd_thermal.c:387:1-23: WARNING:
Function "for_each_child_of_node" should have of_node_put() before goto around lines 391.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
drivers/thermal/sprd_thermal.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/thermal/sprd_thermal.c b/drivers/thermal/sprd_thermal.c
index 3682edb2f466..2778971aaf03 100644
--- a/drivers/thermal/sprd_thermal.c
+++ b/drivers/thermal/sprd_thermal.c
@@ -388,6 +388,7 @@ static int sprd_thm_probe(struct platform_device *pdev)
sen = devm_kzalloc(&pdev->dev, sizeof(*sen), GFP_KERNEL);
if (!sen) {
ret = -ENOMEM;
+ of_node_put(sen_child);
goto disable_clk;
}
@@ -397,12 +398,14 @@ static int sprd_thm_probe(struct platform_device *pdev)
ret = of_property_read_u32(sen_child, "reg", &sen->id);
if (ret) {
dev_err(&pdev->dev, "get sensor reg failed");
+ of_node_put(sen_child);
goto disable_clk;
}
ret = sprd_thm_sensor_calibration(sen_child, thm, sen);
if (ret) {
dev_err(&pdev->dev, "efuse cal analysis failed");
+ of_node_put(sen_child);
goto disable_clk;
}
@@ -416,6 +419,7 @@ static int sprd_thm_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "register thermal zone failed %d\n",
sen->id);
ret = PTR_ERR(sen->tzd);
+ of_node_put(sen_child);
goto disable_clk;
}
--
2.25.1
On Mon, 26 Apr 2021 at 01:48, Krzysztof Kozlowski
<[email protected]> wrote:
>
> Early exits from for_each_available_child_of_node() should decrement the
> node reference counter. Reported by Coccinelle:
>
> drivers/thermal/sprd_thermal.c:387:1-23: WARNING:
> Function "for_each_child_of_node" should have of_node_put() before goto around lines 391.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
Acked-by: Chunyan Zhang <[email protected]>
Thanks for fixing this.
> ---
> drivers/thermal/sprd_thermal.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/thermal/sprd_thermal.c b/drivers/thermal/sprd_thermal.c
> index 3682edb2f466..2778971aaf03 100644
> --- a/drivers/thermal/sprd_thermal.c
> +++ b/drivers/thermal/sprd_thermal.c
> @@ -388,6 +388,7 @@ static int sprd_thm_probe(struct platform_device *pdev)
> sen = devm_kzalloc(&pdev->dev, sizeof(*sen), GFP_KERNEL);
> if (!sen) {
> ret = -ENOMEM;
> + of_node_put(sen_child);
> goto disable_clk;
> }
>
> @@ -397,12 +398,14 @@ static int sprd_thm_probe(struct platform_device *pdev)
> ret = of_property_read_u32(sen_child, "reg", &sen->id);
> if (ret) {
> dev_err(&pdev->dev, "get sensor reg failed");
> + of_node_put(sen_child);
> goto disable_clk;
> }
>
> ret = sprd_thm_sensor_calibration(sen_child, thm, sen);
> if (ret) {
> dev_err(&pdev->dev, "efuse cal analysis failed");
> + of_node_put(sen_child);
> goto disable_clk;
> }
>
> @@ -416,6 +419,7 @@ static int sprd_thm_probe(struct platform_device *pdev)
> dev_err(&pdev->dev, "register thermal zone failed %d\n",
> sen->id);
> ret = PTR_ERR(sen->tzd);
> + of_node_put(sen_child);
> goto disable_clk;
> }
>
> --
> 2.25.1
>
> Subject: [PATCH 1/2] thermal: imx_sc: add missing of_node_put for loop
> iteration
>
> Early exits from for_each_available_child_of_node() should decrement the
> node reference counter. Reported by Coccinelle:
>
> drivers/thermal/imx_sc_thermal.c:93:1-33: WARNING:
> Function "for_each_available_child_of_node" should have of_node_put()
> before return around line 97.
>
Reviewed-by: Jacky Bai <[email protected]>
BR
Jacky Bai
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> drivers/thermal/imx_sc_thermal.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/thermal/imx_sc_thermal.c
> b/drivers/thermal/imx_sc_thermal.c
> index b01d28eca7ee..8d76dbfde6a9 100644
> --- a/drivers/thermal/imx_sc_thermal.c
> +++ b/drivers/thermal/imx_sc_thermal.c
> @@ -93,6 +93,7 @@ static int imx_sc_thermal_probe(struct platform_device
> *pdev)
> for_each_available_child_of_node(np, child) {
> sensor = devm_kzalloc(&pdev->dev, sizeof(*sensor), GFP_KERNEL);
> if (!sensor) {
> + of_node_put(child);
> of_node_put(sensor_np);
> return -ENOMEM;
> }
> @@ -104,6 +105,7 @@ static int imx_sc_thermal_probe(struct
> platform_device *pdev)
> dev_err(&pdev->dev,
> "failed to get valid sensor resource id: %d\n",
> ret);
> + of_node_put(child);
> break;
> }
>
> @@ -114,6 +116,7 @@ static int imx_sc_thermal_probe(struct
> platform_device *pdev)
> if (IS_ERR(sensor->tzd)) {
> dev_err(&pdev->dev, "failed to register thermal zone\n");
> ret = PTR_ERR(sensor->tzd);
> + of_node_put(child);
> break;
> }
>
> --
> 2.25.1