From d1b733e9e35becc5782f60fa6367eb3c53d45221 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Mon, 31 Jul 2006 14:54:57 -0400
Subject: [PATCH] --- yaml --- r: 35119 b: refs/heads/master c:
 48c86da1a211ef13bbfb1c8f2e35dda44a66b8a1 h: refs/heads/master i:   35117:
 e0668a0e59241df1b5aa39dedd4fcd3bb3a6eaab   35115:
 34e66e0f5e06a9962d88ec76ae63e552c83898d0   35111:
 e7737f02b200664ffa1f90abf9c08e06a8a90ff3   35103:
 e8c716f576c607dcd314650f89d0fcaf23d168a0 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8bd00e9ec4a7..10f65ec75b1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 894b62748bec22a98e636ed40221b27d1b9094b7
+refs/heads/master: 48c86da1a211ef13bbfb1c8f2e35dda44a66b8a1
diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 628e5fe3385d..b095f3cc6730 100644
--- a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -2262,7 +2262,7 @@ 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 = 100000; i; i--) {
+		for (i = 10000; i; i--) {
 			tmp = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);
 			if (tmp & BCM43xx_IRQ_READY)
 				goto out;