summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2017-10-09 17:31:39 +0300
committerKalle Valo <kvalo@codeaurora.org>2017-10-09 17:31:39 +0300
commita6127b4440d1f74f26b64006b2f50c9dc6d66efc (patch)
tree4a4fe25e07e97c4c0b8fb6807d573923e3404008 /drivers/net/wireless/intel/iwlwifi/mvm/tt.c
parentc503dd38f850be28867ef7a42d9abe5ade81a9bd (diff)
parent44fd09dad5d2b78efbabbbbf623774e561e36cca (diff)
Merge tag 'iwlwifi-for-kalle-2017-10-06' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Second set of iwlwifi fixes for 4.14 * Fix support for 3168 device series; * Fix a potential crash when using FW debugging recording; * Improve channel flags parsing to avoid warnings on too long traces; * Return -ENODATA when the temperature is not available, since the -EIO we were returning was causing fatal errors in userspace; * Avoid printing too many messages in dmesg when using monitor mode, since this can become very noisy and completely flood the logs;
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/tt.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/tt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
index 4d907f60bce9..1232f63278eb 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
@@ -631,7 +631,7 @@ static int iwl_mvm_tzone_get_temp(struct thermal_zone_device *device,
if (!iwl_mvm_firmware_running(mvm) ||
mvm->fwrt.cur_fw_img != IWL_UCODE_REGULAR) {
- ret = -EIO;
+ ret = -ENODATA;
goto out;
}