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

Commit 7f2ac8fb authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: pcie: fix polling in various places 



iwl_poll_bit may return a strictly positive value when the
poll doesn't match on the first try.
This was caught when WoWLAN started failing upon resume
even if the poll_bit actually succeeded.

Also change a wrong print. If we reach the end of
iwl_pcie_prepare_card_hw, it means that we couldn't
get the devices.

Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 1ffde699

drivers/net/wireless/iwlwifi/pcie/trans.c

+3 −3
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static int iwl_pcie_apm_stop_master(struct iwl_trans *trans) 
	ret = iwl_poll_bit(trans, CSR_RESET,

			   CSR_RESET_REG_FLAG_MASTER_DISABLED,

			   CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);

	if (ret)

	if (ret < 0)

		IWL_WARN(trans, "Master Disable Timed Out, 100 usec\n");



	IWL_DEBUG_INFO(trans, "stop master\n");
@@ -546,7 +546,7 @@ static int iwl_pcie_prepare_card_hw(struct iwl_trans *trans) 
		msleep(25);

	}



	IWL_DEBUG_INFO(trans, "got NIC after %d iterations\n", iter);

	IWL_ERR(trans, "Couldn't prepare the card\n");



	return ret;

}
@@ -1045,7 +1045,7 @@ static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans, 
			   CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

			   CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

			   25000);

	if (ret) {

	if (ret < 0) {

		IWL_ERR(trans, "Failed to resume the device (mac ready)\n");

		return ret;

	}