---

yaml --- r: 183865 b: refs/heads/master c: de9a47f h: refs/heads/master i: 183863: e079816 v: v3
git-mirror · Jan 19, 2010 · afa42c8 · afa42c8
1 parent 3449c5b
commit afa42c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9145834e84805f5efcca4706edfd641047af1d55
+refs/heads/master: de9a47f92795f697964f662415cb27816c2d9b76
diff --git a/trunk/drivers/net/wireless/b43/phy_n.c b/trunk/drivers/net/wireless/b43/phy_n.c
@@ -1624,7 +1624,7 @@ static void b43_nphy_tx_cal_phy_setup(struct b43_wldev *dev)
 		b43_phy_write(dev, B43_NPHY_AFECTL_OVER, tmp | 0x0600);
 
 		regs[4] = b43_phy_read(dev, B43_NPHY_BBCFG);
-		b43_phy_mask(dev, B43_NPHY_BBCFG, ~B43_NPHY_BBCFG_RSTRX);
+		b43_phy_mask(dev, B43_NPHY_BBCFG, (u16)~B43_NPHY_BBCFG_RSTRX);
 
 		tmp = b43_ntab_read(dev, B43_NTAB16(8, 3));
 		regs[5] = tmp;
@@ -1970,7 +1970,7 @@ static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev,
 	u16 lna[3] = { 3, 3, 1 };
 	u16 hpf1[3] = { 7, 2, 0 };
 	u16 hpf2[3] = { 2, 0, 0 };
-	u32 power[3];
+	u32 power[3] = { };
 	u16 gain_save[2];
 	u16 cal_gain[2];
 	struct nphy_iqcal_params cal_params[2];
@@ -2077,7 +2077,7 @@ static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev,
 					(cur_lna << 2));
 			/* TODO:Call N PHY RF Ctrl Override with 0x400, tmp[0],
 				3, 0 as arguments */
-			/* TODO: Call N PHY Force RF Seq with 2 as argument */
+			b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX);
 			b43_nphy_stop_playback(dev);
 
 			if (playtone) {