summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-03-20 13:22:54 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-03-20 14:09:56 +0100
commitf00f188f8212fec9976394976c4fd5d4a3bc4dcf (patch)
tree12a3b8588bbc495a15fd06ced8f954988c9ec4d5 /net
parentcfg80211: fix potential connection work crash (diff)
downloadlinux-f00f188f8212fec9976394976c4fd5d4a3bc4dcf.tar.xz
linux-f00f188f8212fec9976394976c4fd5d4a3bc4dcf.zip
cfg80211: fix error return code in cfg80211_init()
Fix to return a negative error code from the error handling case instead of 0, as returned elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index f382cae983ba..92e3fd44e3b0 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -1096,8 +1096,10 @@ static int __init cfg80211_init(void)
goto out_fail_reg;
cfg80211_wq = create_singlethread_workqueue("cfg80211");
- if (!cfg80211_wq)
+ if (!cfg80211_wq) {
+ err = -ENOMEM;
goto out_fail_wq;
+ }
return 0;