diff options
author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-06-15 17:24:35 (GMT) |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2015-07-11 16:49:31 (GMT) |
commit | 00798c38f49eb028b0c5fac01293783206af29fb (patch) | |
tree | 3899bcb6160c1e88e593fefe789f8f9c79511015 /drivers/net/wireless/ipw2x00 | |
parent | 9d7b372f0514d829b2f712aac5b85eaab2dc0cb2 (diff) | |
download | linux-00798c38f49eb028b0c5fac01293783206af29fb.tar.xz |
ipw2100: fix timeout bug - always evaluated to 0
commit 2c86c275015c ("Add ipw2100 wireless driver.") introduced
HW_PHY_OFF_LOOP_DELAY (HZ / 5000) which always evaluated to 0. Clarified
by Stanislav Yakovlev <stas.yakovlev@gmail.com> that it should be 50
milliseconds thus fixed up to msecs_to_jiffies(50).
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Acked-by: Stanislav Yakovlev <stas.yakovlev@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 08eb229..36818c7 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -1410,7 +1410,7 @@ static int ipw2100_power_cycle_adapter(struct ipw2100_priv *priv) static int ipw2100_hw_phy_off(struct ipw2100_priv *priv) { -#define HW_PHY_OFF_LOOP_DELAY (HZ / 5000) +#define HW_PHY_OFF_LOOP_DELAY (msecs_to_jiffies(50)) struct host_command cmd = { .host_command = CARD_DISABLE_PHY_OFF, |