diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-02-23 18:22:46 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-02-23 18:22:46 +0100 |
| commit | 2c8459a56870cbcda8bdc4cad12492b044277bdb (patch) | |
| tree | f0d112002c58bcf5a846dad50fe355430bb84db6 /drivers/thermal/thermal_sysfs.c | |
| parent | 7251b9e8a007ddd834aa81f8c7ea338884629fec (diff) | |
| parent | 0fac6893ff6c08d6fab6f56b9550a2c4cee589fd (diff) | |
Merge branch 'thermal-core'
Merge thermal core changes for 6.9:
- Minor fixes for thermal governors (Rafael J. Wysocki, Di Shen).
- Trip point handling fixes for the iwlwifi wireless driver (Rafael J.
Wysocki).
- Code cleanups (Rafael J. Wysocki, AngeloGioacchino Del Regno).
* thermal-tmp:
thermal: gov_power_allocator: Avoid overwriting PID coefficients from setup time
thermal: sysfs: Fix up white space in trip_point_temp_store()
iwlwifi: mvm: Use for_each_thermal_trip() for walking trip points
iwlwifi: mvm: Populate trip table before registering thermal zone
iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_mvm_thermal_device
thermal: core: Change governor name to const char pointer
thermal: gov_bang_bang: Fix possible cooling device state ping-pong
thermal: gov_fair_share: Fix dependency on trip points ordering
Diffstat (limited to 'drivers/thermal/thermal_sysfs.c')
| -rw-r--r-- | drivers/thermal/thermal_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c index f4033865b093..d55f9303afb5 100644 --- a/drivers/thermal/thermal_sysfs.c +++ b/drivers/thermal/thermal_sysfs.c @@ -136,7 +136,7 @@ trip_point_temp_store(struct device *dev, struct device_attribute *attr, unlock: mutex_unlock(&tz->lock); - + return ret ? ret : count; } |