Commit afc954fd authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Rafael J. Wysocki
Browse files

thermal: of: Fix OF node leak in thermal_of_trips_init() error path 



Terminating for_each_child_of_node() loop requires dropping OF node
reference, so bailing out after thermal_of_populate_trip() error misses
this.  Solve the OF node reference leak with scoped
for_each_child_of_node_scoped().

Fixes: d0c75fa2 ("thermal/of: Initialize trip points separately")
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Reviewed-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://patch.msgid.link/20240814195823.437597-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 57df60e1

drivers/thermal/thermal_of.c

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int thermal_of_populate_trip(struct device_node *np, 
static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *ntrips)

{

	struct thermal_trip *tt;

	struct device_node *trips, *trip;

	struct device_node *trips;

	int ret, count;



	trips = of_get_child_by_name(np, "trips");
@@ -150,7 +150,7 @@ static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *n 
	*ntrips = count;



	count = 0;

	for_each_child_of_node(trips, trip) {

	for_each_child_of_node_scoped(trips, trip) {

		ret = thermal_of_populate_trip(trip, &tt[count++]);

		if (ret)

			goto out_kfree;