From: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Sat, 22 May 2010 15:48:46 +0000 (+0200)
Subject: Staging: batman-adv: Don't call free_netdev twice
X-Git-Tag: v2.6.35-rc2~14^2~12
X-Git-Url: http://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=3d9b2358930a3e5225b28ac1458236f3d667e368

Staging: batman-adv: Don't call free_netdev twice

Free_netdev is registered as destructor in interface_setup for every
soft_device. This destructor is automatically called from
unregister_netdev and we must not call it again for the freed
net_device.

Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/batman-adv/main.c b/drivers/staging/batman-adv/main.c
index 50a66b42d47..74c70d589a9 100644
--- a/drivers/staging/batman-adv/main.c
+++ b/drivers/staging/batman-adv/main.c
@@ -128,6 +128,9 @@ int init_module(void)
 
 unreg_soft_device:
 	unregister_netdev(soft_device);
+	soft_device = NULL;
+	return -ENOMEM;
+
 free_soft_device:
 	free_netdev(soft_device);
 	soft_device = NULL;