From c34cd34471d48cc042099dbc34f8adf9b2287c19 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 21 Nov 2011 10:44:00 +0100
Subject: [PATCH] --- yaml --- r: 276212 b: refs/heads/master c:
 de3584bd62d87b4c250129fbc46ca52c80330add h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5d2cdb6d6e5b..9018ddcbaadc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c8f2c42c93f415771d6d7b87a0881ba0bb72824
+refs/heads/master: de3584bd62d87b4c250129fbc46ca52c80330add
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index bc1ec2c26fd0..186b7f2a27b6 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -2035,6 +2035,10 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
 	}
 
 	request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
+	if (!request_wiphy) {
+		reg_set_request_processed();
+		return -ENODEV;
+	}
 
 	if (!last_request->intersect) {
 		int r;