diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-22 12:13:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-22 12:13:48 -0700 |
| commit | 539fbb912321ab6361ccc08b72f5f83e8a25c24b (patch) | |
| tree | 13917ec7cfc33df6bc63dc507cea4c245a483631 /drivers/net | |
| parent | 9deed1d5f82cf30308027f9f604a95ac7ffdbe19 (diff) | |
| parent | e528be3c87be953b73e7826a2d7e4b837cbad39d (diff) | |
| download | linux-next-539fbb912321ab6361ccc08b72f5f83e8a25c24b.tar.gz linux-next-539fbb912321ab6361ccc08b72f5f83e8a25c24b.zip | |
Merge tag 'thermal-6.11-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fix from Rafael Wysocki:
"Fix a flood of kernel messages coming from the thermal core on systems
where iwlwifi is loaded, but the network interfaces controlled by it
are down (Rafael Wysocki)"
* tag 'thermal-6.11-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
thermal: core: Allow thermal zones to tell the core to ignore them
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c index ed0796aff722..d92470960b38 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c @@ -621,8 +621,14 @@ static int iwl_mvm_tzone_get_temp(struct thermal_zone_device *device, guard(mvm)(mvm); if (!iwl_mvm_firmware_running(mvm) || - mvm->fwrt.cur_fw_img != IWL_UCODE_REGULAR) - return -ENODATA; + mvm->fwrt.cur_fw_img != IWL_UCODE_REGULAR) { + /* + * Tell the core that there is no valid temperature value to + * return, but it need not worry about this. + */ + *temperature = THERMAL_TEMP_INVALID; + return 0; + } ret = iwl_mvm_get_temp(mvm, &temp); if (ret) |