Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae0146f9 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

brcmsmac: fix read in write_phy_reg 



This reverts a unintended change mad in commit.
commit 4b006b11
Author: Arend van Spriel <arend@broadcom.com>
Date:   Thu Dec 8 15:06:54 2011 -0800

    brcm80211: smac: use bcma functions for register access in phy code

Acked-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cacaa64b

drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ void write_phy_reg(struct brcms_phy *pi, u16 addr, u16 val) 
	bcma_wflush16(pi->d11core, D11REGOFFS(phyregaddr), addr);

	bcma_write16(pi->d11core, D11REGOFFS(phyregdata), val);

	if (addr == 0x72)

		(void)bcma_read16(pi->d11core, D11REGOFFS(phyversion));

		(void)bcma_read16(pi->d11core, D11REGOFFS(phyregdata));

#else

	bcma_write32(pi->d11core, D11REGOFFS(phyregaddr), addr | (val << 16));

	if (++pi->phy_wreg >= pi->phy_wreg_limit) {