diff --git a/[refs] b/[refs] index fe588eea7e35..29833674d11b 100644 --- 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 index acf567c2e220..1c04722edaa0 100644 --- 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;