diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 08:57:24 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 08:58:03 -0700 |
| commit | e765bf84d59257d3c4f948fbce426ea3565e83ad (patch) | |
| tree | e6c2fa13b21a2faf398c3c6ceba8fe5187e381d7 /net/wireless/reg.c | |
| parent | Fix OMAP EHCI suspend/resume failure (i693) '354ab856' causes (diff) | |
| parent | Linux 3.5-rc5 (diff) | |
| download | linux-dev-e765bf84d59257d3c4f948fbce426ea3565e83ad.tar.xz linux-dev-e765bf84d59257d3c4f948fbce426ea3565e83ad.zip | |
Merge 3.5-rc5 into usb-next
This resolves a merge issue with the option.c USB serial driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 15f347477a99..baf5704740ee 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); |