diff options
author | Sven Eckelmann <sven.eckelmann@gmx.de> | 2010-05-22 11:48:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-04 16:38:56 -0400 |
commit | 3d9b2358930a3e5225b28ac1458236f3d667e368 (patch) | |
tree | da48e69df6088bc59aa792fbfbfee8b392cd1139 | |
parent | 20c8a44b7cd5e56b62898a87f620b3a7269eb898 (diff) |
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>
-rw-r--r-- | drivers/staging/batman-adv/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/batman-adv/main.c b/drivers/staging/batman-adv/main.c index 50a66b42d476..74c70d589a93 100644 --- a/drivers/staging/batman-adv/main.c +++ b/drivers/staging/batman-adv/main.c | |||
@@ -128,6 +128,9 @@ int init_module(void) | |||
128 | 128 | ||
129 | unreg_soft_device: | 129 | unreg_soft_device: |
130 | unregister_netdev(soft_device); | 130 | unregister_netdev(soft_device); |
131 | soft_device = NULL; | ||
132 | return -ENOMEM; | ||
133 | |||
131 | free_soft_device: | 134 | free_soft_device: |
132 | free_netdev(soft_device); | 135 | free_netdev(soft_device); |
133 | soft_device = NULL; | 136 | soft_device = NULL; |