summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Stefanik <netrolller.3d@gmail.com>2009-08-26 23:46:18 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-08-28 14:40:53 -0400
commit00fa928df428521793866ff6832569d99be7f3e3 (patch)
tree5fe78e5532d2d5e460feca2ebe769821a22245bc
parent1303dcfd0504565aef8ef63487443ab1f814c00f (diff)
downloadlinux-stable-00fa928df428521793866ff6832569d99be7f3e3.tar.gz
linux-stable-00fa928df428521793866ff6832569d99be7f3e3.tar.bz2
linux-stable-00fa928df428521793866ff6832569d99be7f3e3.zip
b43: LP-PHY: Revert to the original PHY register write routine
After some discussion on IRC about the PHY register write change, I am not sure anymore if this is the right thing to do. Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/b43/phy_lp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
index 80f245c04042..7d2a7027235a 100644
--- a/drivers/net/wireless/b43/phy_lp.c
+++ b/drivers/net/wireless/b43/phy_lp.c
@@ -1496,7 +1496,8 @@ static u16 b43_lpphy_op_read(struct b43_wldev *dev, u16 reg)
static void b43_lpphy_op_write(struct b43_wldev *dev, u16 reg, u16 value)
{
- b43_write32(dev, B43_MMIO_PHY_CONTROL, ((u32)value << 16) | reg);
+ b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
+ b43_write16(dev, B43_MMIO_PHY_DATA, value);
}
static void b43_lpphy_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask,