Merge tag 'mvebu-fixes-4.5-2' of git://git.infradead.org/linux-mvebu into fixes

[deliverable/linux.git] / net / mac80211 / util.c

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 4f6e0b79ef69c673f307219cd77536d9c6bf38e8..58f58bd5202ff5ad99630bc7584a8afeb8c2cf26 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -2043,8 +2043,11 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                 */
                if (sched_scan_req->n_scan_plans > 1 ||
                    __ieee80211_request_sched_scan_start(sched_scan_sdata,
-                                                        sched_scan_req))
+                                                        sched_scan_req)) {
+                       RCU_INIT_POINTER(local->sched_scan_sdata, NULL);
+                       RCU_INIT_POINTER(local->sched_scan_req, NULL);
                        sched_scan_stopped = true;
+               }
        mutex_unlock(&local->mtx);
 
        if (sched_scan_stopped)