Merge branch 'upstream-fixes' into upstream (59d4b684) · Commits · e / devices / android_kernel_sony_msm8994

drivers/net/wireless/bcm43xx/bcm43xx_main.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;