---

yaml --- r: 107762 b: refs/heads/master c: 2d3db67 h: refs/heads/master v: v3
git-mirror · Aug 4, 2008 · 485b5fe · 485b5fe
1 parent 8ded3f8
commit 485b5fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14652562364dad636ddce2cd11e71702ca21bfbd
+refs/heads/master: 2d3db679511be102741cb2d5f8c2b8a1ededdee7
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-5000.c b/trunk/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -241,9 +241,11 @@ static void iwl5000_nic_config(struct iwl_priv *priv)
 	 * (PCIe power is lost before PERST# is asserted),
 	 * causing ME FW to lose ownership and not being able to obtain it back.
 	 */
-	 iwl_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
+	iwl_grab_nic_access(priv);
+	iwl_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
 				APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,
 				~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);
+	iwl_release_nic_access(priv);
 
 	spin_unlock_irqrestore(&priv->lock, flags);
 }