aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorMichael Buesch <mbuesch@freenet.de>2006-02-21 18:08:55 +0100
committerJohn W. Linville <linville@tuxdriver.com>2006-03-27 11:18:39 -0500
commitcad2b31a76763d06048fb23a17b062acd5d46639 (patch)
tree682290730140415df89213a86157bb37031ec0cb /drivers/net
parentbf7b876043e6e1390b1234d740f4fd9af20b3b9e (diff)
[PATCH] bcm43xx: move initialized = 1 to the end of init_board.
Note that the periodic work has to be started with initialized==1 Signed-off-by: Michael Buesch <mbuesch@freenet.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_main.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 57306a65840..4a7d88d2821 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -3484,15 +3484,17 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm)
bcm43xx_pctl_set_clock(bcm, BCM43xx_PCTL_CLK_DYNAMIC);
- spin_lock_irqsave(&bcm->lock, flags);
- bcm->initialized = 1;
- spin_unlock_irqrestore(&bcm->lock, flags);
-
if (bcm->current_core->radio->initial_channel != 0xFF) {
bcm43xx_mac_suspend(bcm);
bcm43xx_radio_selectchannel(bcm, bcm->current_core->radio->initial_channel, 0);
bcm43xx_mac_enable(bcm);
}
+
+ /* Initialization of the board is done. Flag it as such. */
+ spin_lock_irqsave(&bcm->lock, flags);
+ bcm->initialized = 1;
+ spin_unlock_irqrestore(&bcm->lock, flags);
+
bcm43xx_periodic_tasks_setup(bcm);
assert(err == 0);