diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:54:09 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:54:09 -0400 |
| commit | 59d4b684fbe74b25ac8593f39d2aaa86aa485b1f (patch) | |
| tree | fb9b7de045e39313509c370dfa1c0ffa827f41be /drivers/net | |
| parent | 5dd8816aeb1f068ade0349a22009ff7a66f25413 (diff) | |
| parent | bc519f30eb039f023c15167663d5a8a14fed7dcb (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index e69e8b56c4a..c0502905a95 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c @@ -3273,6 +3273,9 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm) bcm43xx_sysfs_register(bcm); //FIXME: check for bcm43xx_sysfs_register failure. This function is a bit messy regarding unwinding, though... + /*FIXME: This should be handled by softmac instead. */ + schedule_work(&bcm->softmac->associnfo.work); + assert(err == 0); out: return err; @@ -3933,9 +3936,6 @@ static int bcm43xx_resume(struct pci_dev *pdev) netif_device_attach(net_dev); - /*FIXME: This should be handled by softmac instead. */ - schedule_work(&bcm->softmac->associnfo.work); - dprintk(KERN_INFO PFX "Device resumed.\n"); return 0; |