[RESEND PATCH 2/2] thermal: sprd: add missing of_node_put for loop iteration

Daniel Lezcano daniel.lezcano at linaro.org
Mon Jun 14 10:28:53 PDT 2021


On 28/05/2021 13:50, Krzysztof Kozlowski 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 <krzysztof.kozlowski at canonical.com>
> Acked-by: Chunyan Zhang <zhang.lyra at gmail.com>
> ---
>  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);

Why not a new label for the rollback routine?

eg. goto out_of_node_put;

Or a new function devm_for_each_available_child_of_node() ?

>  			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;
>  		}
>  
> 


-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog



More information about the linux-arm-kernel mailing list