Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+12 −0
Original line number Diff line number Diff line
@@ -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);

	if (ret) {

		IWL_ERR(priv, "Failed to run INIT ucode: %d\n", ret);

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

	if (ret) {

		IWL_ERR(priv, "Failed to start RT ucode: %d\n", ret);