linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 5/5 V2] b43: N-PHY: silence warnings, add missing call
@ 2010-01-17 23:21 Rafał Miłecki
  2010-01-19 21:55 ` John W. Linville
  0 siblings, 1 reply; 6+ messages in thread
From: Rafał Miłecki @ 2010-01-17 23:21 UTC (permalink / raw)
  To: linux-wireless@vger.kernel.org, John W. Linville
  Cc: bcm43xx-dev@lists.berlios.de

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
New patch I didn't include earlier.
---
  drivers/net/wireless/b43/phy_n.c |    6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 2356d84..3a3cc2f 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/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) {
-- 
1.6.4.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-01-20 10:52 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-17 23:21 [PATCH 5/5 V2] b43: N-PHY: silence warnings, add missing call Rafał Miłecki
2010-01-19 21:55 ` John W. Linville
2010-01-19 22:32   ` Luis R. Rodriguez
2010-01-19 22:55   ` Rafał Miłecki
2010-01-19 22:59   ` Rafał Miłecki
2010-01-20 10:52     ` Michael Buesch

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).