Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[pandora-kernel.git] / drivers / staging / batman-adv / main.c

diff --git a/drivers/staging/batman-adv/main.c b/drivers/staging/batman-adv/main.c
index 9d13979..74c70d5 100644 (file)
--- a/drivers/staging/batman-adv/main.c
+++ b/drivers/staging/batman-adv/main.c
@@ -127,7 +127,10 @@ int init_module(void)
        return 0;
 
 unreg_soft_device:
-       unregister_netdevice(soft_device);
+       unregister_netdev(soft_device);
+       soft_device = NULL;
+       return -ENOMEM;
+
 free_soft_device:
        free_netdev(soft_device);
        soft_device = NULL;