diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-05-25 19:36:57 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2007-06-11 20:28:41 +0200 |
| commit | 1db733eff6319cdf4199fc7d3a3554fef1361f1a (patch) | |
| tree | 9b377fc2b9b6e2a42744ce3a6f5b0e1d6b9499f2 /drivers/net/wireless/libertas/main.c | |
| parent | [PATCH] libertas: correctly unregister mesh netdev on error (diff) | |
| download | linux-1db733eff6319cdf4199fc7d3a3554fef1361f1a.tar.xz linux-1db733eff6319cdf4199fc7d3a3554fef1361f1a.zip | |
[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/libertas/main.c')
| -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: /* 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; |