diff options
| author | Eytan Lifshitz <eytan.lifshitz@intel.com> | 2013-09-11 12:39:18 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-10-11 09:56:58 +0200 |
| commit | 81a67e32c444f05b9f7ba5d33c9221db9d0133e1 (patch) | |
| tree | 35dc981ffa2be4eb0916151a578de85c75eba7f2 /drivers/net/wireless/iwlwifi/mvm/fw.c | |
| parent | 64b928c4e2898dea07d5850a0708dceeb118fa3b (diff) | |
| download | op-kernel-dev-81a67e32c444f05b9f7ba5d33c9221db9d0133e1.zip op-kernel-dev-81a67e32c444f05b9f7ba5d33c9221db9d0133e1.tar.gz | |
iwlwifi: mvm: prevent the NIC to be powered at driver load time.
Some NICs aren't allowed to be powered up at driver load time.
Fix it, and move the external NVM loading from driver load time to
driver up time (parsing the external nvm file remains at driver load time).
Signed-off-by: Eytan Lifshitz <eytan.lifshitz@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/fw.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/fw.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c index 8c784e6..f171dca 100644 --- a/drivers/net/wireless/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/iwlwifi/mvm/fw.c @@ -264,6 +264,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) if (ret) goto error; + /* Read the NVM only at driver load time, no need to do this twice */ if (read_nvm) { /* Read nvm */ ret = iwl_nvm_init(mvm); @@ -273,6 +274,10 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) } } + /* In case we read the NVM from external file, load it to the NIC */ + if (iwlwifi_mod_params.nvm_file) + iwl_mvm_load_nvm_to_nic(mvm); + ret = iwl_nvm_check_version(mvm->nvm_data, mvm->trans); WARN_ON(ret); |
