From sven.eckelmann@gmx.de Tue Jun 1 13:33:36 2010 From: Sven Eckelmann Date: Sat, 22 May 2010 17:48:45 +0200 Subject: Staging: batman-adv: Call unregister_netdev on failures to get rtnl lock To: gregkh@suse.de Cc: b.a.t.m.a.n@lists.open-mesh.net, Sven Eckelmann Message-ID: <1274543327-2258-2-git-send-email-sven.eckelmann@gmx.de> We must call unregister_netdev when we couldn't initialise the batman-adv module and the soft_device was registered. There are two version of the function which we can use: * unregister_netdevice - removes device * unregister_netdev - takes rtnl semaphore and remove device We don't hold the semaphore in an error situation. So we must use unregister_netdev. Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman --- drivers/staging/batman-adv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/staging/batman-adv/main.c +++ b/drivers/staging/batman-adv/main.c @@ -127,7 +127,7 @@ int init_module(void) return 0; unreg_soft_device: - unregister_netdevice(soft_device); + unregister_netdev(soft_device); free_soft_device: free_netdev(soft_device); soft_device = NULL;