1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index c05be03907e4..51d519f93d79 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1859,7 +1859,6 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
         wl->tx_results_count = 0;
         wl->tx_packets_count = 0;
         wl->time_offset = 0;
-        wl->vif = NULL;
         wl->tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
         wl->ap_fw_ps_map = 0;
         wl->ap_ps_map = 0;
@@ -2211,6 +2210,8 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
         if (!test_and_clear_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags))
                 return;
 
+        wl->vif = NULL;
+
         /* because of hardware recovery, we may get here twice */
         if (wl->state != WL1271_STATE_ON)
                 return;