diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:16:17 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:16:17 -0400 |
| commit | e988bcdbe92eb61ea5bfe18aaba6986184118212 (patch) | |
| tree | ae68cbbfdbd06453ae4843f84820c9a3c15d7c7b | |
| parent | c9b84dcac6e20ec8e5424f3dff853daa863bfdd0 (diff) | |
| parent | bc519f30eb039f023c15167663d5a8a14fed7dcb (diff) | |
| download | kernel-crypto-e988bcdbe92eb61ea5bfe18aaba6986184118212.tar.gz kernel-crypto-e988bcdbe92eb61ea5bfe18aaba6986184118212.tar.xz kernel-crypto-e988bcdbe92eb61ea5bfe18aaba6986184118212.zip | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
| -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 e2982a83ae4..7ed18cad29f 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c @@ -3271,6 +3271,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; @@ -3946,9 +3949,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; |