diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-11-19 15:38:48 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-11-19 15:38:48 -0500 |
| commit | ab1f5a532c9d33b49b039660c5ecbc0ab53e7133 (patch) | |
| tree | a1c1d820f2280535978632c5935462efcf5a4c7f /drivers/net/wireless/b43/phy_common.c | |
| parent | f48ecb19bc0443a4272dd0934e7bee4480610df9 (diff) | |
| parent | 4e6ce4dc7ce71d0886908d55129d5d6482a27ff9 (diff) | |
Merge commit '4e6ce4dc7ce71d0886908d55129d5d6482a27ff9' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/b43/phy_common.c')
| -rw-r--r-- | drivers/net/wireless/b43/phy_common.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c index 1dfc682a8055..ee27b06074e1 100644 --- a/drivers/net/wireless/b43/phy_common.c +++ b/drivers/net/wireless/b43/phy_common.c @@ -300,9 +300,7 @@ void b43_phy_write(struct b43_wldev *dev, u16 reg, u16 value) void b43_phy_copy(struct b43_wldev *dev, u16 destreg, u16 srcreg) { - assert_mac_suspended(dev); - dev->phy.ops->phy_write(dev, destreg, - dev->phy.ops->phy_read(dev, srcreg)); + b43_phy_write(dev, destreg, b43_phy_read(dev, srcreg)); } void b43_phy_mask(struct b43_wldev *dev, u16 offset, u16 mask) |