diff options
| author | Eran Harary <eran.harary@intel.com> | 2014-04-23 09:46:09 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-06 19:40:02 +0200 |
| commit | 14b485f041e35f60212317017c2127b8a9b6be31 (patch) | |
| tree | 3b070e751da261f80b1c4ec8c5b992d7336d4f18 /drivers/net/wireless/iwlwifi/mvm/fw.c | |
| parent | iwlwifi: mvm: fix bug with OTP memory size (diff) | |
| download | linux-14b485f041e35f60212317017c2127b8a9b6be31.tar.xz linux-14b485f041e35f60212317017c2127b8a9b6be31.zip | |
iwlwifi: mvm: prevent nic to powered up at driver load
A few devices aren't allowed to be powered up at driver
load time. Add "power_up_nic_in_init" flag to iwl_cfg
structure to customize the load flow according to the
device.
Signed-off-by: Eran Harary <eran.harary@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/fw.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/fw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c index 3d99cf564ba6..34ae3f32b300 100644 --- a/drivers/net/wireless/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/iwlwifi/mvm/fw.c @@ -295,7 +295,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) /* Read the NVM only at driver load time, no need to do this twice */ if (read_nvm) { /* Read nvm */ - ret = iwl_nvm_init(mvm); + ret = iwl_nvm_init(mvm, true); if (ret) { IWL_ERR(mvm, "Failed to read NVM: %d\n", ret); goto error; |