fix some merge error

TI-OpenLink · May 16, 2012 · 8095fcb · 8095fcb
1 parent 63598be
commit 8095fcb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
@@ -1562,7 +1562,7 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
 
 	mutex_lock(&sdata->local->mtx);
 
-	if (sdata->local->tmp_channel || sdata->local->scanning) {
+	if (sdata->tmp_channel || sdata->local->scanning) {
 		mutex_unlock(&sdata->local->mtx);
 		goto out;
 	}