Commit 1db733ef authored by Dan Williams's avatar Dan Williams Committed by John W. Linville

[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: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c7236831
...@@ -878,8 +878,6 @@ int libertas_activate_card(wlan_private *priv, char *fw_name) ...@@ -878,8 +878,6 @@ int libertas_activate_card(wlan_private *priv, char *fw_name)
/* Stop the thread servicing the interrupts */ /* Stop the thread servicing the interrupts */
wake_up_interruptible(&priv->mainthread.waitq); wake_up_interruptible(&priv->mainthread.waitq);
wlan_terminate_thread(&priv->mainthread); wlan_terminate_thread(&priv->mainthread);
kfree(priv->adapter);
free_netdev(dev);
done: done:
lbs_deb_leave_args(LBS_DEB_NET, "ret %d", ret); lbs_deb_leave_args(LBS_DEB_NET, "ret %d", ret);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment