From 5b7dad771ad61882ea5d7be35dcdf1df2b20704e Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad@wizery.com>
Date: Mon, 19 Mar 2012 11:32:55 +0200
Subject: [PATCH] --- yaml --- r: 300895 b: refs/heads/master c:
 830be7e021efd3a801ed0113e6a2244020679a13 h: refs/heads/master i:   300893:
 32699761fb7360adfe49c87154341620cfcf214d   300891:
 0e28adb76c3e078493675d1b95f3c0f7e60111dc   300887:
 68370948ac91eafbd7ba46233593d14ec964d6f2   300879:
 1bc01e7dc0c8d52529b0e452af835985cce362d8   300863:
 74fb27ef61c00a717e7e6afaacf24ac55e66c44b v: v3

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

diff --git a/[refs] b/[refs]
index 28ade6e171c2..214745b666c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 690142e9882679fac4993bbb01582dd1b9440605
+refs/heads/master: 830be7e021efd3a801ed0113e6a2244020679a13
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
index 7618eb73cb33..e21d21d7de8e 100644
--- a/trunk/drivers/net/wireless/wl12xx/main.c
+++ b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -2355,10 +2355,10 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
 		for (i = 0; i < CONF_TX_MAX_AC_COUNT; i++)
 			wl12xx_free_rate_policy(wl,
 						&wlvif->ap.ucast_rate_idx[i]);
+		wl1271_free_ap_keys(wl, wlvif);
 	}
 
 	wl12xx_tx_reset_wlvif(wl, wlvif);
-	wl1271_free_ap_keys(wl, wlvif);
 	if (wl->last_wlvif == wlvif)
 		wl->last_wlvif = NULL;
 	list_del(&wlvif->list);