From: Emmanuel Grumbach Date: Tue, 21 May 2019 19:13:10 +0000 (+0300) Subject: iwlwifi: mvm: remove redundant condition in iwl_mvm_set_hw_rfkill_state X-Git-Tag: v5.4-rc1~131^2~61^2^2~77 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=07c89a601b64e7474dc86dfeed3a1628cad77444;p=users%2Fwilly%2Fxarray.git iwlwifi: mvm: remove redundant condition in iwl_mvm_set_hw_rfkill_state If mvm->fwrt.cur_fw_img != IWL_UCODE_INIT, then rfkill_safe_init_done must be true since rfkill_safe_init_done is set to true before we start to load the runtime image. Remove the redundant condition. Signed-off-by: Emmanuel Grumbach Signed-off-by: Luca Coelho --- diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c index 4888054dc3d8..722e427d534c 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c @@ -1234,8 +1234,7 @@ static bool iwl_mvm_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state) * Stop the device if we run OPERATIONAL firmware or if we are in the * middle of the calibrations. */ - return state && (mvm->fwrt.cur_fw_img != IWL_UCODE_INIT || - rfkill_safe_init_done); + return state && rfkill_safe_init_done; } static void iwl_mvm_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb)