diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2011-02-21 13:45:35 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-02-23 16:25:29 -0500 |
commit | 05db8c5729fac2788f45bf327d168f2ea397f6a1 (patch) | |
tree | 4e999d73243c9de5212280f820e937a7e13ed5bf /drivers/net | |
parent | 8e60b04479ba94ce82e88804b45438533bef4ef9 (diff) |
b43: N-PHY: rev1: restore PHY state after RSSI operations
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-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 3928d82b097b..9f5a3c993239 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c | |||
@@ -2128,7 +2128,7 @@ static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf, | |||
2128 | save_regs_phy[5] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER); | 2128 | save_regs_phy[5] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER); |
2129 | save_regs_phy[6] = b43_phy_read(dev, B43_NPHY_TXF_40CO_B1S0); | 2129 | save_regs_phy[6] = b43_phy_read(dev, B43_NPHY_TXF_40CO_B1S0); |
2130 | save_regs_phy[7] = b43_phy_read(dev, B43_NPHY_TXF_40CO_B32S1); | 2130 | save_regs_phy[7] = b43_phy_read(dev, B43_NPHY_TXF_40CO_B32S1); |
2131 | } else if (dev->phy.rev == 2) { | 2131 | } else { |
2132 | save_regs_phy[0] = b43_phy_read(dev, B43_NPHY_AFECTL_C1); | 2132 | save_regs_phy[0] = b43_phy_read(dev, B43_NPHY_AFECTL_C1); |
2133 | save_regs_phy[1] = b43_phy_read(dev, B43_NPHY_AFECTL_C2); | 2133 | save_regs_phy[1] = b43_phy_read(dev, B43_NPHY_AFECTL_C2); |
2134 | save_regs_phy[2] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER); | 2134 | save_regs_phy[2] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER); |
@@ -2179,7 +2179,7 @@ static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf, | |||
2179 | b43_phy_write(dev, B43_NPHY_AFECTL_OVER, save_regs_phy[5]); | 2179 | b43_phy_write(dev, B43_NPHY_AFECTL_OVER, save_regs_phy[5]); |
2180 | b43_phy_write(dev, B43_NPHY_TXF_40CO_B1S0, save_regs_phy[6]); | 2180 | b43_phy_write(dev, B43_NPHY_TXF_40CO_B1S0, save_regs_phy[6]); |
2181 | b43_phy_write(dev, B43_NPHY_TXF_40CO_B32S1, save_regs_phy[7]); | 2181 | b43_phy_write(dev, B43_NPHY_TXF_40CO_B32S1, save_regs_phy[7]); |
2182 | } else if (dev->phy.rev == 2) { | 2182 | } else { |
2183 | b43_phy_write(dev, B43_NPHY_AFECTL_C1, save_regs_phy[0]); | 2183 | b43_phy_write(dev, B43_NPHY_AFECTL_C1, save_regs_phy[0]); |
2184 | b43_phy_write(dev, B43_NPHY_AFECTL_C2, save_regs_phy[1]); | 2184 | b43_phy_write(dev, B43_NPHY_AFECTL_C2, save_regs_phy[1]); |
2185 | b43_phy_write(dev, B43_NPHY_AFECTL_OVER, save_regs_phy[2]); | 2185 | b43_phy_write(dev, B43_NPHY_AFECTL_OVER, save_regs_phy[2]); |