Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wireless / ath / regd.c

diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index 3f4244f56ce58590a94334f1cf00228307844949..2b14775e6bc63adc44e5a46faa790123f97271bf 100644 (file)
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -342,6 +342,14 @@ int ath_reg_notifier_apply(struct wiphy *wiphy,
        /* We always apply this */
        ath_reg_apply_radar_flags(wiphy);
 
+       /*
+        * This would happen when we have sent a custom regulatory request
+        * a world regulatory domain and the scheduler hasn't yet processed
+        * any pending requests in the queue.
+        */
+       if (!request)
+               return 0;
+
        switch (request->initiator) {
        case NL80211_REGDOM_SET_BY_DRIVER:
        case NL80211_REGDOM_SET_BY_CORE: