---

yaml --- r: 24717 b: refs/heads/master c: cad2b31 h: refs/heads/master i: 24715: 554d470 v: v3
git-mirror · Mar 27, 2006 · d8bd0b5 · d8bd0b5
1 parent 3797ab8
commit d8bd0b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf7b876043e6e1390b1234d740f4fd9af20b3b9e
+refs/heads/master: cad2b31a76763d06048fb23a17b062acd5d46639
diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/trunk/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);