diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945-io.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945-io.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-io.h b/drivers/net/wireless/iwlwifi/iwl-3945-io.h index 2f749432e4bc..994f8bab0dab 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945-io.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945-io.h | |||
@@ -271,16 +271,7 @@ static inline void iwl3945_write_reg_buf(struct iwl3945_priv *priv, | |||
271 | static inline int _iwl3945_poll_direct_bit(struct iwl3945_priv *priv, | 271 | static inline int _iwl3945_poll_direct_bit(struct iwl3945_priv *priv, |
272 | u32 addr, u32 mask, int timeout) | 272 | u32 addr, u32 mask, int timeout) |
273 | { | 273 | { |
274 | int i = 0; | 274 | return _iwl3945_poll_bit(priv, addr, mask, mask, timeout); |
275 | |||
276 | do { | ||
277 | if ((_iwl3945_read_direct32(priv, addr) & mask) == mask) | ||
278 | return i; | ||
279 | udelay(10); | ||
280 | i += 10; | ||
281 | } while (i < timeout); | ||
282 | |||
283 | return -ETIMEDOUT; | ||
284 | } | 275 | } |
285 | 276 | ||
286 | #ifdef CONFIG_IWL3945_DEBUG | 277 | #ifdef CONFIG_IWL3945_DEBUG |