Commit c5bf4fa1 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho

iwlwifi: pcie: initialize debug_rfkill to -1

This will let us introduce a mechanism to start with rfkill
faked, and put 0 here to override it.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 14cf9bc6
...@@ -536,7 +536,7 @@ struct iwl_trans_pcie { ...@@ -536,7 +536,7 @@ struct iwl_trans_pcie {
int ict_index; int ict_index;
bool use_ict; bool use_ict;
bool is_down, opmode_down; bool is_down, opmode_down;
bool debug_rfkill; s8 debug_rfkill;
struct isr_statistics isr_stats; struct isr_statistics isr_stats;
spinlock_t irq_lock; spinlock_t irq_lock;
...@@ -982,7 +982,7 @@ static inline bool iwl_is_rfkill_set(struct iwl_trans *trans) ...@@ -982,7 +982,7 @@ static inline bool iwl_is_rfkill_set(struct iwl_trans *trans)
lockdep_assert_held(&trans_pcie->mutex); lockdep_assert_held(&trans_pcie->mutex);
if (trans_pcie->debug_rfkill) if (trans_pcie->debug_rfkill == 1)
return true; return true;
return !(iwl_read32(trans, CSR_GP_CNTRL) & return !(iwl_read32(trans, CSR_GP_CNTRL) &
......
...@@ -2688,16 +2688,17 @@ static ssize_t iwl_dbgfs_rfkill_write(struct file *file, ...@@ -2688,16 +2688,17 @@ static ssize_t iwl_dbgfs_rfkill_write(struct file *file,
{ {
struct iwl_trans *trans = file->private_data; struct iwl_trans *trans = file->private_data;
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
bool old = trans_pcie->debug_rfkill; bool new_value;
int ret; int ret;
ret = kstrtobool_from_user(user_buf, count, &trans_pcie->debug_rfkill); ret = kstrtobool_from_user(user_buf, count, &new_value);
if (ret) if (ret)
return ret; return ret;
if (old == trans_pcie->debug_rfkill) if (new_value == trans_pcie->debug_rfkill)
return count; return count;
IWL_WARN(trans, "changing debug rfkill %d->%d\n", IWL_WARN(trans, "changing debug rfkill %d->%d\n",
old, trans_pcie->debug_rfkill); trans_pcie->debug_rfkill, new_value);
trans_pcie->debug_rfkill = new_value;
iwl_pcie_handle_rfkill_irq(trans); iwl_pcie_handle_rfkill_irq(trans);
return count; return count;
...@@ -3421,7 +3422,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, ...@@ -3421,7 +3422,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
ret = -ENOMEM; ret = -ENOMEM;
goto out_no_pci; goto out_no_pci;
} }
trans_pcie->debug_rfkill = -1;
if (!cfg->base_params->pcie_l1_allowed) { if (!cfg->base_params->pcie_l1_allowed) {
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment