Skip to content

Commit 59d4b68

Browse files
committed
Merge branch 'upstream-fixes' into upstream
2 parents 5dd8816 + bc519f3 commit 59d4b68

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/net/wireless/bcm43xx/bcm43xx_main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3273,6 +3273,9 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm)
32733273
bcm43xx_sysfs_register(bcm);
32743274
//FIXME: check for bcm43xx_sysfs_register failure. This function is a bit messy regarding unwinding, though...
32753275

3276+
/*FIXME: This should be handled by softmac instead. */
3277+
schedule_work(&bcm->softmac->associnfo.work);
3278+
32763279
assert(err == 0);
32773280
out:
32783281
return err;
@@ -3933,9 +3936,6 @@ static int bcm43xx_resume(struct pci_dev *pdev)
39333936

39343937
netif_device_attach(net_dev);
39353938

3936-
/*FIXME: This should be handled by softmac instead. */
3937-
schedule_work(&bcm->softmac->associnfo.work);
3938-
39393939
dprintk(KERN_INFO PFX "Device resumed.\n");
39403940

39413941
return 0;

0 commit comments

Comments
 (0)