diff options
-rw-r--r-- | drivers/net/wireless/b43/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 1bc40eb3e49a..fff14adb273f 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -2118,7 +2118,6 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) | |||
2118 | int err; | 2118 | int err; |
2119 | 2119 | ||
2120 | /* Get microcode */ | 2120 | /* Get microcode */ |
2121 | tmshigh = ssb_read32(dev->sdev, SSB_TMSHIGH); | ||
2122 | if ((rev >= 5) && (rev <= 10)) | 2121 | if ((rev >= 5) && (rev <= 10)) |
2123 | filename = "ucode5"; | 2122 | filename = "ucode5"; |
2124 | else if ((rev >= 11) && (rev <= 12)) | 2123 | else if ((rev >= 11) && (rev <= 12)) |
@@ -2157,6 +2156,7 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) | |||
2157 | switch (dev->phy.type) { | 2156 | switch (dev->phy.type) { |
2158 | case B43_PHYTYPE_A: | 2157 | case B43_PHYTYPE_A: |
2159 | if ((rev >= 5) && (rev <= 10)) { | 2158 | if ((rev >= 5) && (rev <= 10)) { |
2159 | tmshigh = ssb_read32(dev->sdev, SSB_TMSHIGH); | ||
2160 | if (tmshigh & B43_TMSHIGH_HAVE_2GHZ_PHY) | 2160 | if (tmshigh & B43_TMSHIGH_HAVE_2GHZ_PHY) |
2161 | filename = "a0g1initvals5"; | 2161 | filename = "a0g1initvals5"; |
2162 | else | 2162 | else |
@@ -2201,6 +2201,7 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) | |||
2201 | switch (dev->phy.type) { | 2201 | switch (dev->phy.type) { |
2202 | case B43_PHYTYPE_A: | 2202 | case B43_PHYTYPE_A: |
2203 | if ((rev >= 5) && (rev <= 10)) { | 2203 | if ((rev >= 5) && (rev <= 10)) { |
2204 | tmshigh = ssb_read32(dev->sdev, SSB_TMSHIGH); | ||
2204 | if (tmshigh & B43_TMSHIGH_HAVE_2GHZ_PHY) | 2205 | if (tmshigh & B43_TMSHIGH_HAVE_2GHZ_PHY) |
2205 | filename = "a0g1bsinitvals5"; | 2206 | filename = "a0g1bsinitvals5"; |
2206 | else | 2207 | else |