From e41e529e6babf00c1edf1f9b5c19ea3305cf50d3 Mon Sep 17 00:00:00 2001
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Date: Fri, 9 Apr 2010 11:07:26 +0300
Subject: [PATCH] --- yaml --- r: 194240 b: refs/heads/master c:
 bd9dc49cd565aeb20d4f6eb2f6af4c16acce2ef5 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/wireless/wl12xx/wl1271_main.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 080ecf2bd7c6..ef3bf334eef7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c15cf5fcf9ea0a7749536c201965370d99c86c7f
+refs/heads/master: bd9dc49cd565aeb20d4f6eb2f6af4c16acce2ef5
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
index 5c32d8d72361..4e9754056d45 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1093,6 +1093,14 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw,
 		wl->tx_blocks_freed[i] = 0;
 
 	wl1271_debugfs_reset(wl);
+
+	kfree(wl->fw_status);
+	wl->fw_status = NULL;
+	kfree(wl->tx_res_if);
+	wl->tx_res_if = NULL;
+	kfree(wl->target_mem_map);
+	wl->target_mem_map = NULL;
+
 	mutex_unlock(&wl->mutex);
 }
 
@@ -2387,7 +2395,6 @@ int wl1271_free_hw(struct wl1271 *wl)
 
 	wl1271_debugfs_exit(wl);
 
-	kfree(wl->target_mem_map);
 	vfree(wl->fw);
 	wl->fw = NULL;
 	kfree(wl->nvs);