From: Gábor Stefanik Date: Wed, 26 Aug 2009 21:46:18 +0000 (+0200) Subject: b43: LP-PHY: Revert to the original PHY register write routine X-Git-Tag: MMI-PSA29.97-13-9~26976^2~275^2~24 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=00fa928df428521793866ff6832569d99be7f3e3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: John W. Linville --- 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,