diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-04-24 14:55:21 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-07 15:02:22 -0400 |
commit | e4d18d817f0ffc830bce57906b2a7dd9e713c388 (patch) | |
tree | e3c423dcb415498d5e08c5251eddf3f462360bf3 | |
parent | d4789efe5627858c212753bbac4316198f819486 (diff) |
iwlwifi: remove unnecessary apmg settings
This patch remove settings of APMG_PS_CTRL_VAL_RESET_REQ
from 4965 this should be used only for 3945
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 258777366d29..a98f00f7da42 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -621,19 +621,6 @@ int iwl4965_hw_nic_init(struct iwl_priv *priv) | |||
621 | CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI | | 621 | CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI | |
622 | CSR_HW_IF_CONFIG_REG_BIT_MAC_SI); | 622 | CSR_HW_IF_CONFIG_REG_BIT_MAC_SI); |
623 | 623 | ||
624 | ret = iwl_grab_nic_access(priv); | ||
625 | if (ret < 0) { | ||
626 | spin_unlock_irqrestore(&priv->lock, flags); | ||
627 | IWL_DEBUG_INFO("Failed to init the card\n"); | ||
628 | return ret; | ||
629 | } | ||
630 | |||
631 | iwl_read_prph(priv, APMG_PS_CTRL_REG); | ||
632 | iwl_set_bits_prph(priv, APMG_PS_CTRL_REG, APMG_PS_CTRL_VAL_RESET_REQ); | ||
633 | udelay(5); | ||
634 | iwl_clear_bits_prph(priv, APMG_PS_CTRL_REG, APMG_PS_CTRL_VAL_RESET_REQ); | ||
635 | |||
636 | iwl_release_nic_access(priv); | ||
637 | spin_unlock_irqrestore(&priv->lock, flags); | 624 | spin_unlock_irqrestore(&priv->lock, flags); |
638 | 625 | ||
639 | iwl4965_hw_card_show_info(priv); | 626 | iwl4965_hw_card_show_info(priv); |