From 75d84480c8efec88b350a82e372f7c0f852c57b4 Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad@wizery.com>
Date: Tue, 12 Jun 2012 12:53:13 +0300
Subject: [PATCH] --- yaml --- r: 311377 b: refs/heads/master c:
 fe20b39ec32e975f1054c0b7866c873a954adf05 h: refs/heads/master i:   311375:
 a2caaf288deb51d874dc52738d14b992783a98c1 v: v3

---
 [refs]                   | 2 +-
 trunk/net/wireless/reg.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5d457e69d9d4..9271e9b7b7ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dd45581e6dc98467c539ea67ae5c847646f0efd
+refs/heads/master: fe20b39ec32e975f1054c0b7866c873a954adf05
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 15f347477a99..baf5704740ee 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -1389,7 +1389,7 @@ static void reg_set_request_processed(void)
 	spin_unlock(&reg_requests_lock);
 
 	if (last_request->initiator == NL80211_REGDOM_SET_BY_USER)
-		cancel_delayed_work_sync(&reg_timeout);
+		cancel_delayed_work(&reg_timeout);
 
 	if (need_more_processing)
 		schedule_work(&reg_work);