iwlwifi: first enable RF kill interrupt, then check register

This can solve a race (very unlikely to happen though).

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index 1d9724d45ae932492cedbfd080550257b0a6e441..78aa3208bff94b384bc1637f7bd1eb94cf9d19bc 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -980,14 +980,13 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
                return -EIO;
        }
 
+       iwl_enable_rfkill_int(trans);
+
        /* If platform's RF_KILL switch is NOT set to KILL */
        hw_rfkill = iwl_is_rfkill_set(trans);
        iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
-
-       if (hw_rfkill) {
-               iwl_enable_rfkill_int(trans);
+       if (hw_rfkill)
                return -ERFKILL;
-       }
 
        iwl_write32(trans, CSR_INT, 0xFFFFFFFF);
 
@@ -1560,15 +1559,14 @@ static int iwl_trans_pcie_resume(struct iwl_trans *trans)
 {
        bool hw_rfkill;
 
+       iwl_enable_rfkill_int(trans);
+
        hw_rfkill = iwl_is_rfkill_set(trans);
+       iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
 
-       if (hw_rfkill)
-               iwl_enable_rfkill_int(trans);
-       else
+       if (!hw_rfkill)
                iwl_enable_interrupts(trans);
 
-       iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
-
        return 0;
 }
 #endif /* CONFIG_PM_SLEEP */