Skip to content

Commit

Permalink
thermal/drivers/sprd: Add missing of_node_put for loop iteration
Browse files Browse the repository at this point in the history
[ Upstream commit d8ac5bb ]

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@canonical.com>
Acked-by: Chunyan Zhang <zhang.lyra@gmail.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210614192230.19248-2-krzysztof.kozlowski@canonical.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
krzk authored and gregkh committed Jul 25, 2021
1 parent 20babcd commit 8c12a3a
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions drivers/thermal/sprd_thermal.c
Expand Up @@ -388,7 +388,7 @@ static int sprd_thm_probe(struct platform_device *pdev)
sen = devm_kzalloc(&pdev->dev, sizeof(*sen), GFP_KERNEL);
if (!sen) {
ret = -ENOMEM;
goto disable_clk;
goto of_put;
}

sen->data = thm;
Expand All @@ -397,13 +397,13 @@ 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");
goto disable_clk;
goto of_put;
}

ret = sprd_thm_sensor_calibration(sen_child, thm, sen);
if (ret) {
dev_err(&pdev->dev, "efuse cal analysis failed");
goto disable_clk;
goto of_put;
}

sprd_thm_sensor_init(thm, sen);
Expand All @@ -416,26 +416,29 @@ 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);
goto disable_clk;
goto of_put;
}

thm->sensor[sen->id] = sen;
}
/* sen_child set to NULL at this point */

ret = sprd_thm_set_ready(thm);
if (ret)
goto disable_clk;
goto of_put;

ret = sprd_thm_wait_temp_ready(thm);
if (ret)
goto disable_clk;
goto of_put;

for (i = 0; i < thm->nr_sensors; i++)
sprd_thm_toggle_sensor(thm->sensor[i], true);

platform_set_drvdata(pdev, thm);
return 0;

of_put:
of_node_put(sen_child);
disable_clk:
clk_disable_unprepare(thm->clk);
return ret;
Expand Down

0 comments on commit 8c12a3a

Please sign in to comment.