---

yaml --- r: 35114 b: refs/heads/master c: 3234faa h: refs/heads/master v: v3
git-mirror · Jul 27, 2006 · 9bd3bf9 · 9bd3bf9
1 parent 2324d6e
commit 9bd3bf9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8e7cdb391c50cfc243a387b6690f5a251537e50
+refs/heads/master: 3234faa8abe0c3d6da12cc4a38ce790134c92564
diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -3320,6 +3320,8 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm)
 	mutex_lock(&bcm->mutex);
 	bcm43xx_set_status(bcm, BCM43xx_STAT_INITIALIZING);
 
+	bcm->mac_suspended = 1;
+
 	err = bcm43xx_pctl_set_crystal(bcm, 1);
 	if (err)
 		goto out;
@@ -3832,7 +3834,6 @@ static int bcm43xx_init_private(struct bcm43xx_private *bcm,
 	bcm->softmac->set_channel = bcm43xx_ieee80211_set_chan;
 
 	bcm->irq_savedstate = BCM43xx_IRQ_INITIAL;
-	bcm->mac_suspended = 1;
 	bcm->pci_dev = pci_dev;
 	bcm->net_dev = net_dev;
 	bcm->bad_frames_preempt = modparam_bad_frames_preempt;