From: Dan Williams <dcbw@redhat.com>
Date: Fri, 25 May 2007 17:36:57 +0000 (-0400)
Subject: [PATCH] libertas: don't tear down netdev in libertas_activate_card
X-Git-Tag: v2.6.22-rc5~44^2~2^2~35
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1db733eff6319cdf4199fc7d3a3554fef1361f1a;p=linux-2.6-omap-h63xx.git

[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 b05a6f99a1b..5fde636d186 100644
--- 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;