The following commit has been merged in the batman-adv/next branch: commit 6c1872369d53966dc26be71c96c4c5db13f65981 Author: Rafał Miłecki zajec5@gmail.com Date: Wed Aug 8 19:10:15 2012 +0200
b43: N-PHY: fix 0x2057 radio calib copy/paste mistake
Signed-off-by: Rafał Miłecki zajec5@gmail.com Reported-by: Fengguang Wu fengguang.wu@intel.com Signed-off-by: John W. Linville linville@tuxdriver.com
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index 5c90741..3c35382 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c @@ -572,6 +572,7 @@ static u16 b43_radio_2057_rccal(struct b43_wldev *dev) b43_radio_write(dev, R2057_RCCAL_START_R1_Q1_P1, 0x55); if (!b43_radio_wait_value(dev, R2057_RCCAL_DONE_OSCCAP, 1, 1, 500, 5000000)) + b43dbg(dev->wl, "Radio 0x2057 rccal timeout\n"); b43_radio_write(dev, R2057_RCCAL_START_R1_Q1_P1, 0x15); if (special) { b43_radio_write(dev, R2057_RCCAL_MASTER, 0x73);