diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 807ab89bdad95fb6e6aeb19f96338d49d28e77ef..76c03daeb45591afa723ccfd97874cea85d7ba33 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1166,6 +1166,9 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
 	if (!netif_running(sdata->dev))
 		return;
 
+	if (sdata->local->scanning)
+		return;
+
 	mutex_lock(&ifmgd->mtx);
 
 	if (!ifmgd->associated)
@@ -2213,9 +2216,6 @@ static void ieee80211_sta_monitor_work(struct work_struct *work)
 		container_of(work, struct ieee80211_sub_if_data,
 			     u.mgd.monitor_work);
 
-	if (sdata->local->scanning)
-		return;
-
 	ieee80211_mgd_probe_ap(sdata, false);
 }