diff options
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2100.c')
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 83324b321652..534e6557e7e6 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c | |||
@@ -2181,8 +2181,7 @@ static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status) | |||
2181 | 2181 | ||
2182 | /* Make sure the RF Kill check timer is running */ | 2182 | /* Make sure the RF Kill check timer is running */ |
2183 | priv->stop_rf_kill = 0; | 2183 | priv->stop_rf_kill = 0; |
2184 | cancel_delayed_work(&priv->rf_kill); | 2184 | mod_delayed_work(system_wq, &priv->rf_kill, round_jiffies_relative(HZ)); |
2185 | schedule_delayed_work(&priv->rf_kill, round_jiffies_relative(HZ)); | ||
2186 | } | 2185 | } |
2187 | 2186 | ||
2188 | static void send_scan_event(void *data) | 2187 | static void send_scan_event(void *data) |
@@ -4322,9 +4321,8 @@ static int ipw_radio_kill_sw(struct ipw2100_priv *priv, int disable_radio) | |||
4322 | "disabled by HW switch\n"); | 4321 | "disabled by HW switch\n"); |
4323 | /* Make sure the RF_KILL check timer is running */ | 4322 | /* Make sure the RF_KILL check timer is running */ |
4324 | priv->stop_rf_kill = 0; | 4323 | priv->stop_rf_kill = 0; |
4325 | cancel_delayed_work(&priv->rf_kill); | 4324 | mod_delayed_work(system_wq, &priv->rf_kill, |
4326 | schedule_delayed_work(&priv->rf_kill, | 4325 | round_jiffies_relative(HZ)); |
4327 | round_jiffies_relative(HZ)); | ||
4328 | } else | 4326 | } else |
4329 | schedule_reset(priv); | 4327 | schedule_reset(priv); |
4330 | } | 4328 | } |