summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mac80211_hwsim.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-08-28 13:51:40 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-08-28 13:51:40 -0400
commitf3e979a52c554f45e4ca6f01ca6933acef34b872 (patch)
tree53aa9e61aa7fd0c225528fba4144b2d15f709ad9 /drivers/net/wireless/mac80211_hwsim.c
parentcd80e107b741f9e05c53a01e5cbe2cdf4b6074bc (diff)
parenta98655387762394371b88cdfb8215884757978ab (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/mac80211_hwsim.c')
-rw-r--r--drivers/net/wireless/mac80211_hwsim.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index a0d2aacd5e0..2cd3f54e1ef 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();