diff options
| author |   Oren Givon <oren.givon@intel.com> | 2015-11-25 11:17:41 +0200 |
|---|---|---|
| committer |   Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-01-07 19:01:27 +0200 |
| commit | 488c28e110e18466c99ffb1e2342498b42d3344e (patch) | |
| tree | cde8a78722d55d22baab5ac96dbeb831ebde34b2 /drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | |
| parent | iwlwifi: mvm: bump max API to 20 (diff) | |
| download | linux-dev-488c28e110e18466c99ffb1e2342498b42d3344e.tar.xz linux-dev-488c28e110e18466c99ffb1e2342498b42d3344e.zip | |
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/wireless/intel/iwlwifi/mvm/nvm.c')
| -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) else mvm->nvm_file_name = nvm_file_C; - if (ret == -EFAULT && mvm->nvm_file_name) { + if ((ret == -EFAULT || ret == -ENOENT) && + mvm->nvm_file_name) { /* in case nvm file was failed try again */ ret = iwl_mvm_read_external_nvm(mvm); if (ret) |