From: Arend van Spriel Date: Thu, 9 Feb 2012 20:08:56 +0000 (+0100) Subject: brcm80211: smac: fix unintended fallthru in wlc_phy_radio_init_2057() X-Git-Tag: firefly_0821_release~3680^2~3338^2~108^2~344 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1570e53c14ff21ec5e23c1a7fe814c09aa950dbc;p=firefly-linux-kernel-4.4.55.git brcm80211: smac: fix unintended fallthru in wlc_phy_radio_init_2057() The radio initialization for 2057 rev 5 was using the incorrect register table for the initialization. This patch fixes that. Reported-by: Larry Finger Reviewed-by: Pieter-Paul Giesberts Reviewed-by: Alwin Beukers Signed-off-by: Arend van Spriel Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c index ec7450d2fbd6..c27ec7a9af21 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c @@ -19989,12 +19989,11 @@ static void wlc_phy_radio_init_2057(struct brcms_phy *pi) switch (pi->pubpi.radiorev) { case 5: - if (pi->pubpi.radiover == 0x0) + if (NREV_IS(pi->pubpi.phy_rev, 8)) regs_2057_ptr = regs_2057_rev5; - else if (pi->pubpi.radiover == 0x1) + else if (NREV_IS(pi->pubpi.phy_rev, 9)) regs_2057_ptr = regs_2057_rev5v1; - else - break; + break; case 7: