diff options
| author |   Luca Coelho <luciano.coelho@intel.com> | 2022-01-28 14:48:51 +0200 |
|---|---|---|
| committer |   Kalle Valo <kvalo@kernel.org> | 2022-02-03 10:26:02 +0200 |
| commit | 5f06f6bf8d816578c390a2b8a485d40adcca4749 (patch) | |
| tree | 8ba77d02a4a58515d8b11a95e0ed0e34a169573a /drivers/net/wireless/intel/iwlwifi/mvm/fw.c | |
| parent | iwlwifi: remove deprecated broadcast filtering feature (diff) | |
| download | linux-dev-5f06f6bf8d816578c390a2b8a485d40adcca4749.tar.xz linux-dev-5f06f6bf8d816578c390a2b8a485d40adcca4749.zip | |
iwlwifi: mvm: don't send SAR GEO command for 3160 devices
SAR GEO offsets are not supported on 3160 devices. The code was
refactored and caused us to start sending the command anyway, which
causes a FW assertion failure. Fix that only considering this feature
supported on FW API with major version is 17 if the device is not
3160.
Additionally, fix the caller of iwl_mvm_sar_geo_init() so that it
checks for the return value, which it was ignoring.
Reported-by: Len Brown <lenb@kernel.org>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Fixes: 78a19d5285d9 ("iwlwifi: mvm: Read the PPAG and SAR tables at INIT stage")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/iwlwifi.20220128144623.96f683a89b42.I14e2985bfd7ddd8a8d83eb1869b800c0e7f30db4@changeid
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/fw.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c index 6f4690e56a46..ae589b3b8c46 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c @@ -1741,7 +1741,7 @@ int iwl_mvm_up(struct iwl_mvm *mvm) ret = iwl_mvm_sar_init(mvm); if (ret == 0) ret = iwl_mvm_sar_geo_init(mvm); - else if (ret < 0) + if (ret < 0) goto error; ret = iwl_mvm_sgom_init(mvm); |