]> git.karo-electronics.de Git - linux-beck.git/commitdiff
brcm80211: smac: fix unintended fallthru in wlc_phy_radio_init_2057()
authorArend van Spriel <arend@broadcom.com>
Thu, 9 Feb 2012 20:08:56 +0000 (21:08 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Feb 2012 19:48:50 +0000 (14:48 -0500)
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>
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c

index ec7450d2fbd6230d11181aceb0c582c7fd5c9cb0..c27ec7a9af21cddb9fbe9ce6e2f2add0af621ec0 100644 (file)
@@ -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: