aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-io.h
diff options
context:
space:
mode:
authorZhu, Yi <yi.zhu@intel.com>2008-12-05 10:58:38 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-12-12 13:48:21 -0500
commitf056658bb9c3085d5ec52fbdd45b38d55b899cc9 (patch)
treebebb9e05a6c9b870383280ca0bb547ee577d762a /drivers/net/wireless/iwlwifi/iwl-io.h
parent7262796ab726fcefad9b588a44d1d5a9f221051f (diff)
iwlwifi: fix time interval misuse in iwl_poll_{direct_}bit
The patch fixes the misuse of microsecond with millisecond in the polling mechanism of the iwlwifi driver. The impact of this problem is the unacceptable latency for the whole system (especially during bringing down the wlan interface). Signed-off-by: Zhu Yi <yi.zhu@intel.com> Acked-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-io.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-io.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
index bc10435d96e5..a5c489af937a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -95,7 +95,7 @@ static inline int _iwl_poll_bit(struct iwl_priv *priv, u32 addr,
95 do { 95 do {
96 if ((_iwl_read32(priv, addr) & mask) == (bits & mask)) 96 if ((_iwl_read32(priv, addr) & mask) == (bits & mask))
97 return i; 97 return i;
98 mdelay(10); 98 udelay(10);
99 i += 10; 99 i += 10;
100 } while (i < timeout); 100 } while (i < timeout);
101 101
@@ -277,7 +277,7 @@ static inline int _iwl_poll_direct_bit(struct iwl_priv *priv,
277 do { 277 do {
278 if ((_iwl_read_direct32(priv, addr) & mask) == mask) 278 if ((_iwl_read_direct32(priv, addr) & mask) == mask)
279 return i; 279 return i;
280 mdelay(10); 280 udelay(10);
281 i += 10; 281 i += 10;
282 } while (i < timeout); 282 } while (i < timeout);
283 283