---

yaml
---
r: 145263
b: refs/heads/master
c: a54be5d
h: refs/heads/master
i:
  145261: 7cacf46
  145259: d79d5fe
  145255: 9c042ff
  145247: eec1086
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88f16db7a2fa63b9242e8a0fbc40d51722f2e2f9
+refs/heads/master: a54be5d43aa2d6febc5a4f8dd3b87b9429b60437

trunk/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 */