---

yaml --- r: 24701 b: refs/heads/master c: 921e485 h: refs/heads/master i: 24699: a92cf95 v: v3
git-mirror · Mar 27, 2006 · 29dedfc · 29dedfc
1 parent 718dc6e
commit 29dedfc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62b7f0dfab0508a45a93045d49eda26d5285188d
+refs/heads/master: 921e485f98b11656cdcc39a37605e116e34cb315
diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -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,