diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-10-15 15:20:54 (GMT) |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-10-15 15:20:54 (GMT) |
commit | df9b42963f2d010ae3163a894ce22cf6b27cd344 (patch) | |
tree | f42f826d9bb975766c1a79986c39e64c9a900908 /net/rfkill/input.c | |
parent | 33766368f6532313571534f9112b1796d6651bbe (diff) | |
parent | c3e7724b6bc2f25e46c38dbe68f09d71fafeafb8 (diff) | |
download | linux-fsl-qoriq-df9b42963f2d010ae3163a894ce22cf6b27cd344.tar.xz |
Merge remote-tracking branch 'wireless/master' into mac80211
Diffstat (limited to 'net/rfkill/input.c')
-rw-r--r-- | net/rfkill/input.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/rfkill/input.c b/net/rfkill/input.c index 24c55c5..c9d931e 100644 --- a/net/rfkill/input.c +++ b/net/rfkill/input.c @@ -164,8 +164,7 @@ static void rfkill_schedule_global_op(enum rfkill_sched_op op) rfkill_op_pending = true; if (op == RFKILL_GLOBAL_OP_EPO && !rfkill_is_epo_lock_active()) { /* bypass the limiter for EPO */ - cancel_delayed_work(&rfkill_op_work); - schedule_delayed_work(&rfkill_op_work, 0); + mod_delayed_work(system_wq, &rfkill_op_work, 0); rfkill_last_scheduled = jiffies; } else rfkill_schedule_ratelimited(); |