diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-18 15:13:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-18 15:13:27 -0400 |
| commit | 8cfe523a1294da65ef95b6ed7b0f7db5629f8d88 (patch) | |
| tree | d6118f2e2a55f5906a0c9b42bf6d33c5551cd583 /net/wireless/reg.c | |
| parent | 31fdc5553b42abd7e29bb7b89f6ba07514eb4763 (diff) | |
| parent | bcb7ad7bcbef030e6ba71ede1f9866368aca7c99 (diff) | |
| download | kernel_goldelico_gta04-8cfe523a1294da65ef95b6ed7b0f7db5629f8d88.zip kernel_goldelico_gta04-8cfe523a1294da65ef95b6ed7b0f7db5629f8d88.tar.gz kernel_goldelico_gta04-8cfe523a1294da65ef95b6ed7b0f7db5629f8d88.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 15f3474..baf5704 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1389,7 +1389,7 @@ static void reg_set_request_processed(void) spin_unlock(®_requests_lock); if (last_request->initiator == NL80211_REGDOM_SET_BY_USER) - cancel_delayed_work_sync(®_timeout); + cancel_delayed_work(®_timeout); if (need_more_processing) schedule_work(®_work); |