evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iwlwifi: dvm: start HW before running FW

Browse source 
The new locking in PCIe transport requires to start_hw
before start_fw. This uncovered a bug in dvm which failed
to do so.
Fix that.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Emmanuel Grumbach 2015-06-16 22:37:40 +03:00
parent 6c7d32cfdc
commit 012c02c15a
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/net/wireless/iwlwifi/dvm/mac80211.c
View file

@ -250,12 +250,24 @@ static int __iwl_up(struct iwl_priv *priv)
} }
} }
ret = iwl_trans_start_hw(priv->trans);
if (ret) {
IWL_ERR(priv, "Failed to start HW: %d\n", ret);
goto error;
}
ret = iwl_run_init_ucode(priv); ret = iwl_run_init_ucode(priv);
if (ret) { if (ret) {
IWL_ERR(priv, "Failed to run INIT ucode: %d\n", ret); IWL_ERR(priv, "Failed to run INIT ucode: %d\n", ret);
goto error; goto error;
} }
ret = iwl_trans_start_hw(priv->trans);
if (ret) {
IWL_ERR(priv, "Failed to start HW: %d\n", ret);
goto error;
}
ret = iwl_load_ucode_wait_alive(priv, IWL_UCODE_REGULAR); ret = iwl_load_ucode_wait_alive(priv, IWL_UCODE_REGULAR);
if (ret) { if (ret) {
IWL_ERR(priv, "Failed to start RT ucode: %d\n", ret); IWL_ERR(priv, "Failed to start RT ucode: %d\n", ret);