diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2010-01-17 07:04:08 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-19 16:43:08 -0500 |
| commit | c57199bc32ebcd914253496486d2e09b1c9a3de0 (patch) | |
| tree | 51fdb8bb308f240b320eaa2c5ef078ad812b4f09 /drivers | |
| parent | 67c0d6e2d1abb9cbff9235143a8faaef89119628 (diff) | |
b43: N-PHY: store seq mode for proper restoring (follow specs)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/b43/phy_n.c | 4 |
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"); |
| 912 | ok: | 913 | ok: |
| 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 | ||
| 917 | static void b43_nphy_bphy_init(struct b43_wldev *dev) | 917 | static void b43_nphy_bphy_init(struct b43_wldev *dev) |