thermal: sysfs: Fix trip_point_hyst_store()

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 changing the code to parse 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 <rafael.j.wysocki@intel.com>
Cc: 6.3+ <stable@vger.kernel.org> # 6.3+

diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index 6c20c9f90a05acb777b13019fa341fcb80e69320..4e6a97db894e9cfd19c0015a755c8638a3d1b3c6 100644 (file)
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -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)) {
@@ -198,7 +195,11 @@ trip_point_hyst_store(struct device *dev, struct device_attribute *attr,
        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);