| From b726eee9221b81c7ca485bb858f27db35a9f2b41 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 25 Nov 2019 13:21:58 +0200 |
| Subject: iwlwifi: mvm: fix NVM check for 3168 devices |
| |
| From: Luca Coelho <luciano.coelho@intel.com> |
| |
| [ Upstream commit b3f20e098293892388d6a0491d6bbb2efb46fbff ] |
| |
| We had a check on !NVM_EXT and then a check for NVM_SDP in the else |
| block of this if. The else block, obviously, could only be reached if |
| using NVM_EXT, so it would never be NVM_SDP. |
| |
| Fix that by checking whether the nvm_type is IWL_NVM instead of |
| checking for !IWL_NVM_EXT to solve this issue. |
| |
| Reported-by: Stefan Sperling <stsp@stsp.name> |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c |
| index f2579c94ffdbc..3270faafe0bc3 100644 |
| --- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c |
| @@ -286,7 +286,7 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm) |
| int regulatory_type; |
| |
| /* Checking for required sections */ |
| - if (mvm->trans->cfg->nvm_type != IWL_NVM_EXT) { |
| + if (mvm->trans->cfg->nvm_type == IWL_NVM) { |
| if (!mvm->nvm_sections[NVM_SECTION_TYPE_SW].data || |
| !mvm->nvm_sections[mvm->cfg->nvm_hw_section_num].data) { |
| IWL_ERR(mvm, "Can't parse empty OTP/NVM sections\n"); |
| -- |
| 2.20.1 |
| |