[PATCH] libertas: don't tear down netdev in libertas_activate_card

libertas_activate_card() doesn't create the netdev, and shouldn't
free it on error.  The caller of libertas_activate_card() is
responsible for cleaning up errors from libertas_add_card(),
not libertas_activate_card().

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

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index b05a6f9..5fde636 100644 (file)
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -878,8 +878,6 @@ err_registerdev:
        /* Stop the thread servicing the interrupts */
        wake_up_interruptible(&priv->mainthread.waitq);
        wlan_terminate_thread(&priv->mainthread);
-       kfree(priv->adapter);
-       free_netdev(dev);
 done:
        lbs_deb_leave_args(LBS_DEB_NET, "ret %d", ret);
        return ret;