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

Commit f3d5b45b authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlwifi: fix resart flow after fw error 



Clear STATUS_FW_ERROR in the _up_ flow before reseting NIC.
UP flow will otherwise call restart again causing endless restart loop.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 64e72c3e

drivers/net/wireless/iwlwifi/iwl4965-base.c

+3 −3
Original line number Diff line number Diff line
@@ -2857,9 +2857,6 @@ static void iwl_alive_start(struct iwl_priv *priv) 
	/* After the ALIVE response, we can send host commands to 4965 uCode */

	set_bit(STATUS_ALIVE, &priv->status);



	/* Clear out the uCode error bit if it is set */

	clear_bit(STATUS_FW_ERROR, &priv->status);



	if (iwl_is_rfkill(priv))

		return;
@@ -3099,6 +3096,9 @@ static int __iwl4965_up(struct iwl_priv *priv) 
			continue;

		}



		/* Clear out the uCode error bit if it is set */

		clear_bit(STATUS_FW_ERROR, &priv->status);



		/* start card; "initialize" will load runtime ucode */

		iwl4965_nic_start(priv);