From deb4cbb43710f9ef5bcc8680b9d963767a0f8640 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Wed, 15 Dec 2010 19:24:12 -0800 Subject: [PATCH] --- yaml --- r: 225335 b: refs/heads/master c: 931299cf87701962ea1811dc216f48f3f7a4ebc8 h: refs/heads/master i: 225333: bf4b8980d5ee5ae4f8b9396facd95e7ec4e63bfe 225331: 588d367069bf315f7c39b194a2cedace152d3373 225327: 49861160ae2d374b658bdb0e1b3b26c3c9204694 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/regd.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 402ffaceb465..498e3803173b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2784fe915cd25adf23ea28534019308d8a144721 +refs/heads/master: 931299cf87701962ea1811dc216f48f3f7a4ebc8 diff --git a/trunk/drivers/net/wireless/ath/regd.c b/trunk/drivers/net/wireless/ath/regd.c index 3f4244f56ce5..2b14775e6bc6 100644 --- a/trunk/drivers/net/wireless/ath/regd.c +++ b/trunk/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: