Commit 012c02c1 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach

iwlwifi: dvm: start HW before running FW

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 6c7d32cf
...@@ -250,12 +250,24 @@ static int __iwl_up(struct iwl_priv *priv) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment