From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Mon, 26 Aug 2013 07:32:58 +0000 (+0800)
Subject: mac80211_hwsim: fix error return code in init_mac80211_hwsim()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bcdd822007e44b1da1ad5a62f20b75ee7d8da608;p=deliverable%2Flinux.git

mac80211_hwsim: fix error return code in init_mac80211_hwsim()

Fix to return -ENOMEM in the netdev alloc error handling
case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index a0d2aacd5e09..2cd3f54e1efa 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -2528,8 +2528,10 @@ static int __init init_mac80211_hwsim(void)
 	}
 
 	hwsim_mon = alloc_netdev(0, "hwsim%d", hwsim_mon_setup);
-	if (hwsim_mon == NULL)
+	if (hwsim_mon == NULL) {
+		err = -ENOMEM;
 		goto failed;
+	}
 
 	rtnl_lock();