From 9efd1ef763c2b8c6bb6ac6eb9e3960769d6ef15e Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Wed, 13 May 2009 17:04:39 -0400
Subject: [PATCH] --- yaml --- r: 150407 b: refs/heads/master c:
 4776c6e7f66f853011bc1fd6fe37fa63f0b6982c h: refs/heads/master i:   150405:
 2ab62d0ddc4e8010d6fb5e2460d6b5ef70f85669   150403:
 799bca07ef7d693f533e4c9cc6fe34a3acc5b0b1   150399:
 18e263d76f50c650b5ec5b3c8cb1233f6a730a4e v: v3

---
 [refs]                       | 2 +-
 trunk/net/wireless/nl80211.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2f4e292b1146..a6dab1e662de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e74fbb412be9baeae5ee61e25dad0b8c1a287494
+refs/heads/master: 4776c6e7f66f853011bc1fd6fe37fa63f0b6982c
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 1cf57f53a283..52a877998ff7 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -2567,7 +2567,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
 			rem_reg_rules) {
 		num_rules++;
 		if (num_rules > NL80211_MAX_SUPP_REG_RULES)
-			goto bad_reg;
+			return -EINVAL;
 	}
 
 	if (!reg_is_valid_request(alpha2))