diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index d8dadbf04138..98baf8af6da8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
| @@ -98,7 +98,8 @@ int iwl5000_apm_init(struct iwl_priv *priv) | |||
| 98 | iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE); | 98 | iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE); |
| 99 | 99 | ||
| 100 | /* wait for clock stabilization */ | 100 | /* wait for clock stabilization */ |
| 101 | ret = iwl_poll_direct_bit(priv, CSR_GP_CNTRL, | 101 | ret = iwl_poll_bit(priv, CSR_GP_CNTRL, |
| 102 | CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, | ||
| 102 | CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000); | 103 | CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000); |
| 103 | if (ret < 0) { | 104 | if (ret < 0) { |
| 104 | IWL_DEBUG_INFO(priv, "Failed to init the card\n"); | 105 | IWL_DEBUG_INFO(priv, "Failed to init the card\n"); |
| @@ -138,7 +139,8 @@ int iwl5000_apm_reset(struct iwl_priv *priv) | |||
| 138 | iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE); | 139 | iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE); |
| 139 | 140 | ||
| 140 | /* wait for clock stabilization */ | 141 | /* wait for clock stabilization */ |
| 141 | ret = iwl_poll_direct_bit(priv, CSR_GP_CNTRL, | 142 | ret = iwl_poll_bit(priv, CSR_GP_CNTRL, |
| 143 | CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, | ||
| 142 | CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000); | 144 | CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000); |
| 143 | if (ret < 0) { | 145 | if (ret < 0) { |
| 144 | IWL_DEBUG_INFO(priv, "Failed to init the card\n"); | 146 | IWL_DEBUG_INFO(priv, "Failed to init the card\n"); |