UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Johannes Berg 2015-05-07 14:47:50 +02:00 committed by Emmanuel Grumbach
parent 3db93420f7
commit d643c43222
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/iwlwifi/mvm/fw.c
View File

@ -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)