From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 28 Nov 2014 13:54:31 +0000 (+0100)
Subject: cfg80211: remove unneeded initialisations in nl80211_set_reg
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ea372c5452651f1b65ee817cd3409d63f0699b35;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

cfg80211: remove unneeded initialisations in nl80211_set_reg

Some variables are assigned unconditionally, remove their
initialisations to help avoid introducing errors later.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 4fae26d722f8..a17d6bc6b22c 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -5422,11 +5422,11 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
 {
 	struct nlattr *tb[NL80211_REG_RULE_ATTR_MAX + 1];
 	struct nlattr *nl_reg_rule;
-	char *alpha2 = NULL;
-	int rem_reg_rules = 0, r = 0;
+	char *alpha2;
+	int rem_reg_rules, r;
 	u32 num_rules = 0, rule_idx = 0, size_of_regd;
 	enum nl80211_dfs_regions dfs_region = NL80211_DFS_UNSET;
-	struct ieee80211_regdomain *rd = NULL;
+	struct ieee80211_regdomain *rd;
 
 	if (!info->attrs[NL80211_ATTR_REG_ALPHA2])
 		return -EINVAL;