summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEran Harary <eran.harary@intel.com>2014-04-30 14:31:59 +0200
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-05-06 19:40:04 +0200
commitbb926924e9dc515e83a6a69e9b8b226638b9178d (patch)
tree0fdfac2bba61d3e1d79eb215b784014b898bd84a
parentiwlwifi: mvm: select the MAC address according to priority (diff)
downloadlinux-bb926924e9dc515e83a6a69e9b8b226638b9178d.tar.xz
linux-bb926924e9dc515e83a6a69e9b8b226638b9178d.zip
iwlwifi: mvm: fix bug in parse_nvm_sections
The old code checks if hw_section_num is valid while the right thing to do is to check if section[hw_section_num].data is valid. Signed-off-by: Eran Harary <eran.harary@intel.com> Reviewed-by: Liad Kaufman <liad.kaufman@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/nvm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/nvm.c b/drivers/net/wireless/iwlwifi/mvm/nvm.c
index 6d0e659c3dec..6b88c29ebe6b 100644
--- a/drivers/net/wireless/iwlwifi/mvm/nvm.c
+++ b/drivers/net/wireless/iwlwifi/mvm/nvm.c
@@ -246,7 +246,7 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)
return NULL;
}
/* MAC_OVERRIDE or at least HW section must exist */
- if (!mvm->cfg->nvm_hw_section_num &&
+ if (!mvm->nvm_sections[mvm->cfg->nvm_hw_section_num].data &&
!mvm->nvm_sections[NVM_SECTION_TYPE_MAC_OVERRIDE].data) {
IWL_ERR(mvm,
"Can't parse mac_address, empty sections\n");