From 3778de0f334408472f9e2304ab86c2fe259a23d7 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Wed, 13 May 2009 17:04:42 -0400
Subject: [PATCH] --- yaml --- r: 145267 b: refs/heads/master c:
 5078b2e32ad4b1f753b1c837c15892202f753c97 h: refs/heads/master i:   145265:
 17b958da87648c796ec0bc63a34604217cf65ce1   145263:
 1fe1be9dd5138de2ba762391b1575cf3c89fd211 v: v3

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

diff --git a/[refs] b/[refs]
index f2b254a4677b..9909c7589dff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 267d493b322b05984048aef8ea9b5b213490bbe0
+refs/heads/master: 5078b2e32ad4b1f753b1c837c15892202f753c97
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 08265ca15785..487cb627ddba 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -1551,6 +1551,13 @@ static int regulatory_hint_core(const char *alpha2)
 
 	queue_regulatory_request(request);
 
+	/*
+	 * This ensures last_request is populated once modules
+	 * come swinging in and calling regulatory hints and
+	 * wiphy_apply_custom_regulatory().
+	 */
+	flush_scheduled_work();
+
 	return 0;
 }