mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
thermal: sysfs: Fix trip_point_hyst_store()
After commit2e38a2a981
("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:2e38a2a981
("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+
This commit is contained in:
parent
ce9ecca023
commit
ea3105672c
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user