Browse Source

iwlwifi: mvm: handle device start failure correctly

If the device fails to start correctly prior to loading the
regular runtime firmware (after having run the INIT firmware),
treat that error correctly by actually checking the return
value of _iwl_trans_start_hw() and stopping the device again
before returning an error.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Johannes Berg 10 years ago
parent
commit
d643c43222
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/net/wireless/iwlwifi/mvm/fw.c

+ 2 - 2
drivers/net/wireless/iwlwifi/mvm/fw.c

@@ -662,9 +662,9 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
 		 * device that are triggered by the INIT firwmare (MFUART).
 		 * device that are triggered by the INIT firwmare (MFUART).
 		 */
 		 */
 		_iwl_trans_stop_device(mvm->trans, false);
 		_iwl_trans_stop_device(mvm->trans, false);
-		_iwl_trans_start_hw(mvm->trans, false);
+		ret = _iwl_trans_start_hw(mvm->trans, false);
 		if (ret)
 		if (ret)
-			return ret;
+			goto error;
 	}
 	}
 
 
 	if (iwlmvm_mod_params.init_dbg)
 	if (iwlmvm_mod_params.init_dbg)