diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2008-04-24 20:55:21 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-05-07 21:02:22 +0200 |
| commit | e4d18d817f0ffc830bce57906b2a7dd9e713c388 (patch) | |
| tree | e3c423dcb415498d5e08c5251eddf3f462360bf3 /drivers | |
| parent | iwlwifi: move hw_rx_handler_setup to iwl-4965.c (diff) | |
| download | linux-e4d18d817f0ffc830bce57906b2a7dd9e713c388.tar.xz linux-e4d18d817f0ffc830bce57906b2a7dd9e713c388.zip | |
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>
Diffstat (limited to 'drivers')
| -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) CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI | CSR_HW_IF_CONFIG_REG_BIT_MAC_SI); - ret = iwl_grab_nic_access(priv); - if (ret < 0) { - spin_unlock_irqrestore(&priv->lock, flags); - IWL_DEBUG_INFO("Failed to init the card\n"); - return ret; - } - - iwl_read_prph(priv, APMG_PS_CTRL_REG); - iwl_set_bits_prph(priv, APMG_PS_CTRL_REG, APMG_PS_CTRL_VAL_RESET_REQ); - udelay(5); - iwl_clear_bits_prph(priv, APMG_PS_CTRL_REG, APMG_PS_CTRL_VAL_RESET_REQ); - - iwl_release_nic_access(priv); spin_unlock_irqrestore(&priv->lock, flags); iwl4965_hw_card_show_info(priv); |