diff options
author | Arend van Spriel <arend@broadcom.com> | 2012-02-09 15:08:56 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-22 14:48:50 -0500 |
commit | 1570e53c14ff21ec5e23c1a7fe814c09aa950dbc (patch) | |
tree | 33eb3c5023f6b3e6d29d4b499c94bf2078e20dec /drivers | |
parent | 14433f4df21b2ab8287084d8348bede6bf813a90 (diff) |
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 <Larry.Finger@lwfinger.net>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 7 |
1 files changed, 3 insertions, 4 deletions
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) | |||
19989 | switch (pi->pubpi.radiorev) { | 19989 | switch (pi->pubpi.radiorev) { |
19990 | case 5: | 19990 | case 5: |
19991 | 19991 | ||
19992 | if (pi->pubpi.radiover == 0x0) | 19992 | if (NREV_IS(pi->pubpi.phy_rev, 8)) |
19993 | regs_2057_ptr = regs_2057_rev5; | 19993 | regs_2057_ptr = regs_2057_rev5; |
19994 | else if (pi->pubpi.radiover == 0x1) | 19994 | else if (NREV_IS(pi->pubpi.phy_rev, 9)) |
19995 | regs_2057_ptr = regs_2057_rev5v1; | 19995 | regs_2057_ptr = regs_2057_rev5v1; |
19996 | else | 19996 | break; |
19997 | break; | ||
19998 | 19997 | ||
19999 | case 7: | 19998 | case 7: |
20000 | 19999 | ||