Commit 8018e02a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull thermal control fix from Rafael Wysocki:
 "Unbreak the trip point update sysfs interface that has been broken
  since the 6.3 cycle (Rafael Wysocki)"

* tag 'thermal-6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: sysfs: Fix trip_point_hyst_store()
parents b184c040 ea310567

drivers/thermal/thermal_sysfs.c

+5 −4
Original line number Diff line number Diff line
@@ -185,9 +185,6 @@ trip_point_hyst_store(struct device *dev, struct device_attribute *attr, 
	if (sscanf(attr->attr.name, "trip_point_%d_hyst", &trip_id) != 1)

		return -EINVAL;



	if (kstrtoint(buf, 10, &trip.hysteresis))

		return -EINVAL;



	mutex_lock(&tz->lock);



	if (!device_is_registered(dev)) {
@@ -199,6 +196,10 @@ trip_point_hyst_store(struct device *dev, struct device_attribute *attr, 
	if (ret)

		goto unlock;



	ret = kstrtoint(buf, 10, &trip.hysteresis);

	if (ret)

		goto unlock;



	ret = thermal_zone_set_trip(tz, trip_id, &trip);

unlock:

	mutex_unlock(&tz->lock);