aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/fw.c
diff options
context:
space:
mode:
authorEran Harary <eran.harary@intel.com>2014-04-23 03:46:09 -0400
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-05-06 13:40:02 -0400
commit14b485f041e35f60212317017c2127b8a9b6be31 (patch)
tree3b070e751da261f80b1c4ec8c5b992d7336d4f18 /drivers/net/wireless/iwlwifi/mvm/fw.c
parent300855443ee722e49ebd0d9ca086d68886cf4a83 (diff)
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.c2
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)
295 /* Read the NVM only at driver load time, no need to do this twice */ 295 /* Read the NVM only at driver load time, no need to do this twice */
296 if (read_nvm) { 296 if (read_nvm) {
297 /* Read nvm */ 297 /* Read nvm */
298 ret = iwl_nvm_init(mvm); 298 ret = iwl_nvm_init(mvm, true);
299 if (ret) { 299 if (ret) {
300 IWL_ERR(mvm, "Failed to read NVM: %d\n", ret); 300 IWL_ERR(mvm, "Failed to read NVM: %d\n", ret);
301 goto error; 301 goto error;