To preserve bisectability (just in case!), I'm folding this into the
original patch.
John
On Mon, Dec 12, 2011 at 03:15:13PM -0800, Franky Lin wrote:
> From: Arend van Spriel <arend@xxxxxxxxxxxx>
>
> With the BCMA support patches a compilation issue was introduced
> with CONFIG_BCM47XX set. This patch fixes that issue.
>
> Reported-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
> Reviewed-by: Pieter-Paul Giesberts <pieterpg@xxxxxxxxxxxx>
> Reviewed-by: Alwin Beukers <alwin@xxxxxxxxxxxx>
> Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
> Signed-off-by: Franky Lin <frankyl@xxxxxxxxxxxx>
> ---
> .../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 687aafa..d2c7fb1 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(phyregdata), val);
> + (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) {
> --
> 1.7.5.4
>
>
>
--
John W. Linville Someday the world will need a hero, and you
linville@xxxxxxxxxxxxx might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
