diff options
| author |   Hauke Mehrtens <hauke@hauke-m.de> | 2012-06-30 15:16:20 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2012-07-10 12:16:56 -0400 |
| commit | ae0146f987cd4f4702ce9764a395d3aa1cff9777 (patch) | |
| tree | 9be728e39108b279a1b57739fa60bc69c79694e1 | |
| parent | brcmsmac: extend brcms_c_chipmatch() to also handle non PCIe devices (diff) | |
| download | linux-dev-ae0146f987cd4f4702ce9764a395d3aa1cff9777.tar.xz linux-dev-ae0146f987cd4f4702ce9764a395d3aa1cff9777.zip | |
brcmsmac: fix read in write_phy_reg
This reverts a unintended change mad in commit.
commit 4b006b11ca18995677c5f1cd03cc9c42fbe80693
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: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c index d16cbecdfc6c..1703e7d7f828 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c @@ -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) { |