diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-08-04 04:00:47 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-08-04 15:09:13 -0400 |
commit | 2d3db679511be102741cb2d5f8c2b8a1ededdee7 (patch) | |
tree | 5b764529395ed197c48332567d38e623cce7b5f6 /drivers | |
parent | 14652562364dad636ddce2cd11e71702ca21bfbd (diff) |
iwlwifi: grap nic access before accessing periphery registers
We need to grap nic access before accessing periphery registers.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index c5b104fd149c..f3d139b663e6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -241,9 +241,11 @@ static void iwl5000_nic_config(struct iwl_priv *priv) | |||
241 | * (PCIe power is lost before PERST# is asserted), | 241 | * (PCIe power is lost before PERST# is asserted), |
242 | * causing ME FW to lose ownership and not being able to obtain it back. | 242 | * causing ME FW to lose ownership and not being able to obtain it back. |
243 | */ | 243 | */ |
244 | iwl_set_bits_mask_prph(priv, APMG_PS_CTRL_REG, | 244 | iwl_grab_nic_access(priv); |
245 | iwl_set_bits_mask_prph(priv, APMG_PS_CTRL_REG, | ||
245 | APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS, | 246 | APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS, |
246 | ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS); | 247 | ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS); |
248 | iwl_release_nic_access(priv); | ||
247 | 249 | ||
248 | spin_unlock_irqrestore(&priv->lock, flags); | 250 | spin_unlock_irqrestore(&priv->lock, flags); |
249 | } | 251 | } |