Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'upstream-fixes' into upstream

Browse source
This commit is contained in:
John W. Linville 2006-05-17 14:54:09 -04:00
commit 59d4b684fb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/wireless/bcm43xx/bcm43xx_main.c
View file

@ -3273,6 +3273,9 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm)
bcm43xx_sysfs_register(bcm); bcm43xx_sysfs_register(bcm);
//FIXME: check for bcm43xx_sysfs_register failure. This function is a bit messy regarding unwinding, though... //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); assert(err == 0);
out: out:
return err; return err;
@ -3933,9 +3936,6 @@ static int bcm43xx_resume(struct pci_dev *pdev)
netif_device_attach(net_dev); 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"); dprintk(KERN_INFO PFX "Device resumed.\n");
return 0; return 0;