thermal: sysfs: Fix trip_point_hyst_store()

PATCH New Rafael J. Wysocki 1 participant 1 message Sep 15, 2023 Thermal

lore

Share & tools

lore

Rafael J. Wysocki

author

2023-09-15 18:36 UTC #0 lore raw

PATCH 1/1 thermal: sysfs: Fix trip_point_hyst_store()

From: Rafael J. Wysocki <[email protected]>

After commit 2e38a2a981b2 ("thermal/core: Add a generic thermal_zone_set_trip() function") updating a trip point temperature doesn't actually work, because the value supplied by user space is subsequently overwritten with the current trip point hysteresis value.

Fix this by parsing the number string supplied by user space after retrieving the current trip point data from the thermal zone.

Also drop a redundant tab character from the code in question.

Fixes 2e38a2a981b2 ("thermal/core: Add a generic thermal_zone_set_trip() function")

Signed-off-by Rafael J. Wysocki <[email protected]>

Cc 6.3+ <[email protected]> # 6.3+

---
 drivers/thermal/thermal_sysfs.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

drivers/thermal/thermal_sysfs.c +5 -4

Index: linux-pm/drivers/thermal/thermal_sysfs.c
===================================================================
@@ -185,9 +185,6 @@ trip_point_hyst_store(struct device *dev
 	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)) {

@@ -198,7 +195,11 @@ trip_point_hyst_store(struct device *dev
 	ret = __thermal_zone_get_trip(tz, trip_id, &trip);
 	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);