diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-22 05:53:20 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-22 05:53:23 -0500 |
| commit | 6c529a266bdc590a870ee2d2092ff6527eff427b (patch) | |
| tree | 7be65fa2578820a1258b5a1e8e063a509a5d6176 /drivers/net/wireless/libertas/main.c | |
| parent | 7639dae0ca11038286bbbcda05f2bef601c1eb8d (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into perf/core
Merge reason: Pick up the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 46b88b118c99..fcd1bbfc632d 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
| @@ -915,8 +915,6 @@ void lbs_remove_card(struct lbs_private *priv) | |||
| 915 | 915 | ||
| 916 | lbs_free_adapter(priv); | 916 | lbs_free_adapter(priv); |
| 917 | lbs_cfg_free(priv); | 917 | lbs_cfg_free(priv); |
| 918 | |||
| 919 | priv->dev = NULL; | ||
| 920 | free_netdev(dev); | 918 | free_netdev(dev); |
| 921 | 919 | ||
| 922 | lbs_deb_leave(LBS_DEB_MAIN); | 920 | lbs_deb_leave(LBS_DEB_MAIN); |