diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-20 17:31:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-20 17:31:25 -0700 |
| commit | 86c2fe1e3adacec9204c03f2b056b49534ecf0ed (patch) | |
| tree | 9d6a2c3f3802cd83d5a266df1d2576bd77aaad93 /drivers/net/wireless/ath5k/reset.c | |
| parent | 1ddbcb005c395518c2cd0df504cff3d4b5c85853 (diff) | |
| parent | a6c67339784db5763d6f20ae1881aeebe8c5a9f4 (diff) | |
| download | op-kernel-dev-86c2fe1e3adacec9204c03f2b056b49534ecf0ed.zip op-kernel-dev-86c2fe1e3adacec9204c03f2b056b49534ecf0ed.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath5k/reset.c')
| -rw-r--r-- | drivers/net/wireless/ath5k/reset.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath5k/reset.c b/drivers/net/wireless/ath5k/reset.c index 7a17d31..5f72c11 100644 --- a/drivers/net/wireless/ath5k/reset.c +++ b/drivers/net/wireless/ath5k/reset.c @@ -26,7 +26,7 @@ \*****************************/ #include <linux/pci.h> /* To determine if a card is pci-e */ -#include <linux/bitops.h> /* For get_bitmask_order */ +#include <linux/log2.h> #include "ath5k.h" #include "reg.h" #include "base.h" @@ -69,10 +69,10 @@ static inline int ath5k_hw_write_ofdm_timings(struct ath5k_hw *ah, /* Get exponent * ALGO: coef_exp = 14 - highest set bit position */ - coef_exp = get_bitmask_order(coef_scaled); + coef_exp = ilog2(coef_scaled); /* Doesn't make sense if it's zero*/ - if (!coef_exp) + if (!coef_scaled || !coef_exp) return -EINVAL; /* Note: we've shifted coef_scaled by 24 */ @@ -359,7 +359,7 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, int flags, bool initial) mode |= AR5K_PHY_MODE_FREQ_5GHZ; if (ah->ah_radio == AR5K_RF5413) - clock |= AR5K_PHY_PLL_40MHZ_5413; + clock = AR5K_PHY_PLL_40MHZ_5413; else clock |= AR5K_PHY_PLL_40MHZ; |
