Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+5
-4
+5
-4
drivers/thermal/thermal_sysfs.c
+5
-4
drivers/thermal/thermal_sysfs.c
···
185
185
if (sscanf(attr->attr.name, "trip_point_%d_hyst", &trip_id) != 1)
186
186
return -EINVAL;
187
187
188
-
if (kstrtoint(buf, 10, &trip.hysteresis))
189
-
return -EINVAL;
190
-
191
188
mutex_lock(&tz->lock);
192
189
193
190
if (!device_is_registered(dev)) {
···
195
198
ret = __thermal_zone_get_trip(tz, trip_id, &trip);
196
199
if (ret)
197
200
goto unlock;
198
-
201
+
202
+
ret = kstrtoint(buf, 10, &trip.hysteresis);
203
+
if (ret)
204
+
goto unlock;
205
+
199
206
ret = thermal_zone_set_trip(tz, trip_id, &trip);
200
207
unlock:
201
208
mutex_unlock(&tz->lock);