diff options
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_main.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index 8e08c41f86..4c4a2d71ca 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c | |||
@@ -2473,16 +2473,13 @@ void bcm43xx_mac_suspend(struct bcm43xx_private *bcm) | |||
2473 | bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD) | 2473 | bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD) |
2474 | & ~BCM43xx_SBF_MAC_ENABLED); | 2474 | & ~BCM43xx_SBF_MAC_ENABLED); |
2475 | bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON); /* dummy read */ | 2475 | bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON); /* dummy read */ |
2476 | for (i = 1000; i > 0; i--) { | 2476 | for (i = 100000; i; i--) { |
2477 | tmp = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON); | 2477 | tmp = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON); |
2478 | if (tmp & BCM43xx_IRQ_READY) { | 2478 | if (tmp & BCM43xx_IRQ_READY) |
2479 | i = -1; | 2479 | return; |
2480 | break; | ||
2481 | } | ||
2482 | udelay(10); | 2480 | udelay(10); |
2483 | } | 2481 | } |
2484 | if (!i) | 2482 | printkl(KERN_ERR PFX "MAC suspend failed\n"); |
2485 | printkl(KERN_ERR PFX "Failed to suspend mac!\n"); | ||
2486 | } | 2483 | } |
2487 | 2484 | ||
2488 | void bcm43xx_set_iwmode(struct bcm43xx_private *bcm, | 2485 | void bcm43xx_set_iwmode(struct bcm43xx_private *bcm, |