diff options
author | Oren Givon <oren.givon@intel.com> | 2015-11-25 04:17:41 -0500 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-01-07 12:01:27 -0500 |
commit | 488c28e110e18466c99ffb1e2342498b42d3344e (patch) | |
tree | cde8a78722d55d22baab5ac96dbeb831ebde34b2 /drivers/net | |
parent | f370f5cffe7ae8b92026c8d6cb2738b4d3aeed9c (diff) |
iwlwifi: nvm: fix loading default NVM file
Fix loading the default NVM file, in the case where the
requested NVM file isn't found in the file system.
Signed-off-by: Oren Givon <oren.givon@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c index e4fe8a66a3a0..7a3da2da6fd0 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | |||
@@ -642,7 +642,8 @@ int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic) | |||
642 | else | 642 | else |
643 | mvm->nvm_file_name = nvm_file_C; | 643 | mvm->nvm_file_name = nvm_file_C; |
644 | 644 | ||
645 | if (ret == -EFAULT && mvm->nvm_file_name) { | 645 | if ((ret == -EFAULT || ret == -ENOENT) && |
646 | mvm->nvm_file_name) { | ||
646 | /* in case nvm file was failed try again */ | 647 | /* in case nvm file was failed try again */ |
647 | ret = iwl_mvm_read_external_nvm(mvm); | 648 | ret = iwl_mvm_read_external_nvm(mvm); |
648 | if (ret) | 649 | if (ret) |