diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 1390f41425f1..cc5285407e88 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -2227,9 +2227,6 @@ static int b43_chip_init(struct b43_wldev *dev) | |||
2227 | if (err) | 2227 | if (err) |
2228 | goto err_gpio_cleanup; | 2228 | goto err_gpio_cleanup; |
2229 | b43_radio_turn_on(dev); | 2229 | b43_radio_turn_on(dev); |
2230 | dev->radio_hw_enable = b43_is_hw_radio_enabled(dev); | ||
2231 | b43dbg(dev->wl, "Radio %s by hardware\n", | ||
2232 | dev->radio_hw_enable ? "enabled" : "disabled"); | ||
2233 | 2230 | ||
2234 | b43_write16(dev, 0x03E6, 0x0000); | 2231 | b43_write16(dev, 0x03E6, 0x0000); |
2235 | err = b43_phy_init(dev); | 2232 | err = b43_phy_init(dev); |
@@ -3252,6 +3249,9 @@ static void setup_struct_wldev_for_init(struct b43_wldev *dev) | |||
3252 | { | 3249 | { |
3253 | /* Flags */ | 3250 | /* Flags */ |
3254 | dev->reg124_set_0x4 = 0; | 3251 | dev->reg124_set_0x4 = 0; |
3252 | /* Assume the radio is enabled. If it's not enabled, the state will | ||
3253 | * immediately get fixed on the first periodic work run. */ | ||
3254 | dev->radio_hw_enable = 1; | ||
3255 | 3255 | ||
3256 | /* Stats */ | 3256 | /* Stats */ |
3257 | memset(&dev->stats, 0, sizeof(dev->stats)); | 3257 | memset(&dev->stats, 0, sizeof(dev->stats)); |