Merge tag 'thermal-6.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

torvalds · torvalds · commit da13af839228 · 2025-01-10T14:46:49.000-08:00
Pull thermal control fix from Rafael Wysocki:
 "Fix an OF node leak in the code parsing thermal zone DT properties
  (Joe Hattori)"

* tag 'thermal-6.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: of: fix OF node leak in of_thermal_zone_find()
diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
@@ -160,6 +160,7 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int
 				return ERR_PTR(ret);
 			}
 
+			of_node_put(sensor_specs.np);
 			if ((sensor == sensor_specs.np) && id == (sensor_specs.args_count ?
 								  sensor_specs.args[0] : 0)) {
 				pr_debug("sensor %pOFn id=%d belongs to %pOFn\n", sensor, id, child);

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ static struct device_node of_thermal_zone_find(struct device_node sensor, int`
`160`	`160`	`return ERR_PTR(ret);`
`161`	`161`	`}`
`162`	`162`
	`163`	`+ of_node_put(sensor_specs.np);`
`163`	`164`	`if ((sensor == sensor_specs.np) && id == (sensor_specs.args_count ?`
`164`	`165`	`sensor_specs.args[0] : 0)) {`
`165`	`166`	`pr_debug("sensor %pOFn id=%d belongs to %pOFn\n", sensor, id, child);`