diff --git a/[refs] b/[refs]
index 3c3a7afdc011..916289f22c84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 485318471e85c1ddb5e3056fa30fdbbc46d759c6
+refs/heads/master: 91a3bd76155085d41520cf41ede39e8b7f01aeff
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 807ab89bdad9..76c03daeb455 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/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);
 }