summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-05-25 13:35:23 -0400
committerJohn W. Linville <linville@tuxdriver.com>2007-06-11 14:28:41 -0400
commitc72368310d6799da92ec12192d8b15c2ae7ab0b5 (patch)
tree9cbf10552e2f5ffc40ecdc57f5c85e916172d574
parent4ace1138767869547944798ba9f1fd6d1e048acb (diff)
downloadop-kernel-dev-c72368310d6799da92ec12192d8b15c2ae7ab0b5.zip
op-kernel-dev-c72368310d6799da92ec12192d8b15c2ae7ab0b5.tar.gz
[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>
-rw-r--r--drivers/net/wireless/libertas/if_usb.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 6433be6..10698a1 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);
OpenPOWER on IntegriCloud