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

Commit efbf6e3b authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Emmanuel Grumbach
Browse files

iwlwifi: trans: clear FW_ERROR status in common code 



Clear the FW_ERROR status before the common start_fw transport code.
Remove the transport specific clears.

After these patches the FW_ERROR flag is only set and cleared by common
transport code.

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 2a988e98

drivers/net/wireless/iwlwifi/iwl-trans.h

+1 −0
Original line number Diff line number Diff line
@@ -590,6 +590,7 @@ static inline int iwl_trans_start_fw(struct iwl_trans *trans, 


	WARN_ON_ONCE(!trans->rx_mpdu_cmd);



	clear_bit(STATUS_FW_ERROR, &trans->status);

	return trans->ops->start_fw(trans, fw, run_in_rfkill);

}

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

+0 −2
Original line number Diff line number Diff line
@@ -589,8 +589,6 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans, 
		return -EIO;

	}



	clear_bit(STATUS_FW_ERROR, &trans->status);



	iwl_enable_rfkill_int(trans);



	/* If platform's RF_KILL switch is NOT set to KILL */