Skip to content

Commit 355fe78

Browse files
committed
Revert "iwlwifi: fix time interval misuse in iwl_poll_{direct_}bit"
This reverts commit eedd69e.
1 parent 6f30590 commit 355fe78

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

drivers/net/wireless/iwlwifi/iwl-3945-io.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ static inline int _iwl3945_poll_bit(struct iwl3945_priv *priv, u32 addr,
9393
do {
9494
if ((_iwl3945_read32(priv, addr) & mask) == (bits & mask))
9595
return i;
96-
udelay(10);
96+
mdelay(10);
9797
i += 10;
9898
} while (i < timeout);
9999

@@ -276,7 +276,7 @@ static inline int _iwl3945_poll_direct_bit(struct iwl3945_priv *priv,
276276
do {
277277
if ((_iwl3945_read_direct32(priv, addr) & mask) == mask)
278278
return i;
279-
udelay(10);
279+
mdelay(10);
280280
i += 10;
281281
} while (i < timeout);
282282

drivers/net/wireless/iwlwifi/iwl-io.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static inline int _iwl_poll_bit(struct iwl_priv *priv, u32 addr,
9595
do {
9696
if ((_iwl_read32(priv, addr) & mask) == (bits & mask))
9797
return i;
98-
udelay(10);
98+
mdelay(10);
9999
i += 10;
100100
} while (i < timeout);
101101

@@ -277,7 +277,7 @@ static inline int _iwl_poll_direct_bit(struct iwl_priv *priv,
277277
do {
278278
if ((_iwl_read_direct32(priv, addr) & mask) == mask)
279279
return i;
280-
udelay(10);
280+
mdelay(10);
281281
i += 10;
282282
} while (i < timeout);
283283

drivers/net/wireless/iwlwifi/iwl-tx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ void iwl_txq_ctx_stop(struct iwl_priv *priv)
628628
iwl_write_direct32(priv, FH_TCSR_CHNL_TX_CONFIG_REG(ch), 0x0);
629629
iwl_poll_direct_bit(priv, FH_TSSR_TX_STATUS_REG,
630630
FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch),
631-
1000);
631+
200);
632632
}
633633
iwl_release_nic_access(priv);
634634
spin_unlock_irqrestore(&priv->lock, flags);

0 commit comments

Comments
 (0)