From: Dan Williams <dcbw@redhat.com>
Date: Fri, 25 May 2007 17:35:23 +0000 (-0400)
Subject: [PATCH] libertas: correctly unregister mesh netdev on error
X-Git-Tag: v2.6.22-rc5~44^2~2^2~36
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c72368310d6799da92ec12192d8b15c2ae7ab0b5;p=linux-2.6-omap-h63xx.git

[PATCH] libertas: correctly unregister mesh netdev on error

Subject says it all.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 6433be63fb7..10698a1c1c3 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -231,8 +231,7 @@ static int if_usb_probe(struct usb_interface *intf,
 	return 0;
 
 err_activate_card:
-	unregister_netdev(priv->mesh_dev);
-	free_netdev(priv->mesh_dev);
+	libertas_remove_mesh(priv);
 err_add_mesh:
 	free_netdev(priv->dev);
 	kfree(priv->adapter);