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))