summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorEran Harary <eran.harary@intel.com>2013-12-11 08:13:50 +0200
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2013-12-31 19:03:50 +0200
commitce836c76da42d8e54042f6d759663e7ad79769ba (patch)
tree50daed9d063dd74b8948385398af0dde61059813 /drivers/net/wireless
parent12d423e816c69b0b4457bc047dda9a0a1c1a53c1 (diff)
downloadblackbird-op-linux-ce836c76da42d8e54042f6d759663e7ad79769ba.tar.gz
blackbird-op-linux-ce836c76da42d8e54042f6d759663e7ad79769ba.zip
iwlwifi: pcie: Fix CSR_RESET operation access type
The access to the CSR_RESET reg should be done as a complete DWORD and not by setting a bit. This is the right way to reset the device. Signed-off-by: Eran Harary <eran.harary@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/trans.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index bc584efcebab..2cb6332d38b4 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -779,7 +779,7 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
}
/* Reset the entire device */
- iwl_set_bit(trans, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);
+ iwl_write32(trans, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);
usleep_range(10, 15);
OpenPOWER on IntegriCloud