Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 921e485f authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

[PATCH] bcm43xx: heavily increase mac_suspend timeout. 



Signed-off-by: default avatarMichael Buesch <mbuesch@freenet.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 62b7f0df

drivers/net/wireless/bcm43xx/bcm43xx_main.c

+4 −7
Original line number Diff line number Diff line
@@ -2473,16 +2473,13 @@ void bcm43xx_mac_suspend(struct bcm43xx_private *bcm) 
	                bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD)

			& ~BCM43xx_SBF_MAC_ENABLED);

	bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON); /* dummy read */

	for (i = 1000; i > 0; i--) {

	for (i = 100000; i; i--) {

		tmp = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);

		if (tmp & BCM43xx_IRQ_READY) {

			i = -1;

			break;

		}

		if (tmp & BCM43xx_IRQ_READY)

			return;

		udelay(10);

	}

	if (!i)

		printkl(KERN_ERR PFX "Failed to suspend mac!\n");

	printkl(KERN_ERR PFX "MAC suspend failed\n");

}



void bcm43xx_set_iwmode(struct bcm43xx_private *bcm,