From 263b6bc2a4f8e273cce3beef067f6f0aef959a9d Mon Sep 17 00:00:00 2001
From: "Wu, Fengguang" <fengguang.wu@intel.com>
Date: Wed, 17 Dec 2008 16:52:32 +0800
Subject: [PATCH] --- yaml --- r: 122817 b: refs/heads/master c:
 4087f6f68cdbd2845c7e54236bae1b058a7b827b h: refs/heads/master i:   122815:
 1a4814e250fe23fbfe5b3a2b990b8f930bfa5894 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-io.h | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fb0c6ee5c414..525ec9adf498 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: febf3370c63b4ea7fc1cedb9a73ac37e3cb21079
+refs/heads/master: 4087f6f68cdbd2845c7e54236bae1b058a7b827b
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-io.h b/trunk/drivers/net/wireless/iwlwifi/iwl-io.h
index 998ac1971696..0a92e7431ada 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-io.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -87,17 +87,18 @@ static inline u32 __iwl_read32(char *f, u32 l, struct iwl_priv *priv, u32 ofs)
 #define iwl_read32(p, o) _iwl_read32(p, o)
 #endif
 
+#define IWL_POLL_INTERVAL 10	/* microseconds */
 static inline int _iwl_poll_bit(struct iwl_priv *priv, u32 addr,
 				u32 bits, u32 mask, int timeout)
 {
-	int i = 0;
+	int t = 0;
 
 	do {
 		if ((_iwl_read32(priv, addr) & mask) == (bits & mask))
-			return i;
-		udelay(10);
-		i += 10;
-	} while (i < timeout);
+			return t;
+		udelay(IWL_POLL_INTERVAL);
+		t += IWL_POLL_INTERVAL;
+	} while (t < timeout);
 
 	return -ETIMEDOUT;
 }