diff options
author | Liad Kaufman <liad.kaufman@intel.com> | 2014-10-21 09:01:50 -0400 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-11-11 10:15:03 -0500 |
commit | b93b1fe3b5323d5418b151dd620c4eb80270f683 (patch) | |
tree | 3d9e5ee81033dac44ee18821155bbd0eb44391fe /drivers/net/wireless/iwlwifi | |
parent | efad21d2a2e9b69dfeee576cd01831e94290241c (diff) |
iwlwifi: mvm: fix init_dbg flow to work as expected
Even if running the driver with param init_dbg=1 - on INIT
image error - iwl_trans_stop_device() was still called. This
patch fixes that and calls iwl_trans_stop_device() on INIT
image failure only if init_dbg=0.
Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/ops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c index bd52ecfabedb..8c5bdf9360f9 100644 --- a/drivers/net/wireless/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/iwlwifi/mvm/ops.c | |||
@@ -524,7 +524,8 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, | |||
524 | 524 | ||
525 | mutex_lock(&mvm->mutex); | 525 | mutex_lock(&mvm->mutex); |
526 | err = iwl_run_init_mvm_ucode(mvm, true); | 526 | err = iwl_run_init_mvm_ucode(mvm, true); |
527 | iwl_trans_stop_device(trans); | 527 | if (!err || !iwlmvm_mod_params.init_dbg) |
528 | iwl_trans_stop_device(trans); | ||
528 | mutex_unlock(&mvm->mutex); | 529 | mutex_unlock(&mvm->mutex); |
529 | /* returns 0 if successful, 1 if success but in rfkill */ | 530 | /* returns 0 if successful, 1 if success but in rfkill */ |
530 | if (err < 0 && !iwlmvm_mod_params.init_dbg) { | 531 | if (err < 0 && !iwlmvm_mod_params.init_dbg) { |