diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-20 15:02:02 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-20 15:02:02 -0500 |
| commit | 88daf80dcca19ff995cc263592426f734a9702f3 (patch) | |
| tree | 7a52e25df74e52d00c3821032e719244e8a5526f /net/rfkill/core.c | |
| parent | 010d3c3989706d800ae72253773fa6537cc9f74c (diff) | |
| parent | 35582ad9d342025653aaf28ed321bf5352488d7f (diff) | |
| download | linux-stable-88daf80dcca19ff995cc263592426f734a9702f3.tar.gz linux-stable-88daf80dcca19ff995cc263592426f734a9702f3.tar.bz2 linux-stable-88daf80dcca19ff995cc263592426f734a9702f3.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/rfkill/core.c')
| -rw-r--r-- | net/rfkill/core.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index ed7e0b4e7f90..b3b16c070a7f 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -789,7 +789,8 @@ void rfkill_resume_polling(struct rfkill *rfkill) if (!rfkill->ops->poll) return; - schedule_work(&rfkill->poll_work.work); + queue_delayed_work(system_power_efficient_wq, + &rfkill->poll_work, 0); } EXPORT_SYMBOL(rfkill_resume_polling); @@ -894,7 +895,8 @@ static void rfkill_poll(struct work_struct *work) */ rfkill->ops->poll(rfkill, rfkill->data); - schedule_delayed_work(&rfkill->poll_work, + queue_delayed_work(system_power_efficient_wq, + &rfkill->poll_work, round_jiffies_relative(POLL_INTERVAL)); } @@ -958,7 +960,8 @@ int __must_check rfkill_register(struct rfkill *rfkill) INIT_WORK(&rfkill->sync_work, rfkill_sync_work); if (rfkill->ops->poll) - schedule_delayed_work(&rfkill->poll_work, + queue_delayed_work(system_power_efficient_wq, + &rfkill->poll_work, round_jiffies_relative(POLL_INTERVAL)); if (!rfkill->persistent || rfkill_epo_lock_active) { |