---

yaml --- r: 311377 b: refs/heads/master c: fe20b39 h: refs/heads/master i: 311375: a2caaf2 v: v3
git-mirror · Jun 13, 2012 · 75d8448 · 75d8448
1 parent 8def740
commit 75d8448
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);