diff options
author | Dan Williams <dcbw@redhat.com> | 2007-05-25 13:36:57 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2007-06-11 14:28:41 -0400 |
commit | 1db733eff6319cdf4199fc7d3a3554fef1361f1a (patch) | |
tree | 9b377fc2b9b6e2a42744ce3a6f5b0e1d6b9499f2 /drivers/net/wireless | |
parent | c72368310d6799da92ec12192d8b15c2ae7ab0b5 (diff) |
[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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/libertas/main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index b05a6f99a1b2..5fde636d1863 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
@@ -878,8 +878,6 @@ err_registerdev: | |||
878 | /* Stop the thread servicing the interrupts */ | 878 | /* Stop the thread servicing the interrupts */ |
879 | wake_up_interruptible(&priv->mainthread.waitq); | 879 | wake_up_interruptible(&priv->mainthread.waitq); |
880 | wlan_terminate_thread(&priv->mainthread); | 880 | wlan_terminate_thread(&priv->mainthread); |
881 | kfree(priv->adapter); | ||
882 | free_netdev(dev); | ||
883 | done: | 881 | done: |
884 | lbs_deb_leave_args(LBS_DEB_NET, "ret %d", ret); | 882 | lbs_deb_leave_args(LBS_DEB_NET, "ret %d", ret); |
885 | return ret; | 883 | return ret; |