aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/b43/phy_n.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 99024b02bdbd..95190d42372c 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -897,6 +897,7 @@ static void b43_nphy_force_rf_sequence(struct b43_wldev *dev,
897 [B43_RFSEQ_UPDATE_GAINU] = B43_NPHY_RFSEQTR_UPGU, 897 [B43_RFSEQ_UPDATE_GAINU] = B43_NPHY_RFSEQTR_UPGU,
898 }; 898 };
899 int i; 899 int i;
900 u16 seq_mode = b43_phy_read(dev, B43_NPHY_RFSEQMODE);
900 901
901 B43_WARN_ON(seq >= ARRAY_SIZE(trigger)); 902 B43_WARN_ON(seq >= ARRAY_SIZE(trigger));
902 903
@@ -910,8 +911,7 @@ static void b43_nphy_force_rf_sequence(struct b43_wldev *dev,
910 } 911 }
911 b43err(dev->wl, "RF sequence status timeout\n"); 912 b43err(dev->wl, "RF sequence status timeout\n");
912ok: 913ok:
913 b43_phy_mask(dev, B43_NPHY_RFSEQMODE, 914 b43_phy_write(dev, B43_NPHY_RFSEQMODE, seq_mode);
914 ~(B43_NPHY_RFSEQMODE_CAOVER | B43_NPHY_RFSEQMODE_TROVER));
915} 915}
916 916
917static void b43_nphy_bphy_init(struct b43_wldev *dev) 917static void b43_nphy_bphy_init(struct b43_wldev *dev)