summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/if_usb.c
diff options
context:
space:
mode:
authorDan Williams2007-05-25 19:35:23 +0200
committerJohn W. Linville2007-06-11 20:28:41 +0200
commitc72368310d6799da92ec12192d8b15c2ae7ab0b5 (patch)
tree9cbf10552e2f5ffc40ecdc57f5c85e916172d574 /drivers/net/wireless/libertas/if_usb.c
parent[PATCH] libertas: replace 'macaddress' with 'bssid' (diff)
downloadkernel-qcow2-linux-c72368310d6799da92ec12192d8b15c2ae7ab0b5.tar.gz
kernel-qcow2-linux-c72368310d6799da92ec12192d8b15c2ae7ab0b5.tar.xz
kernel-qcow2-linux-c72368310d6799da92ec12192d8b15c2ae7ab0b5.zip
[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>
Diffstat (limited to 'drivers/net/wireless/libertas/if_usb.c')
-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 6433be63fb7f..10698a1c1c30 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);