The following commit has been merged in the master branch: commit 20c8a44b7cd5e56b62898a87f620b3a7269eb898 Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Sat May 22 17:48:45 2010 +0200

Staging: batman-adv: Call unregister_netdev on failures to get rtnl lock

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 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 9d13979..50a66b4 100644 --- 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;