diff --git a/[refs] b/[refs]
index b774265cbf0a..a480a8e87a71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eb92f6a3948c4358eb8ad1c0905490ddd2fc0ab
+refs/heads/master: 217c15777784331336a8eb232af7e2fa180b136a
diff --git a/trunk/net/wireless/sme.c b/trunk/net/wireless/sme.c
index bad4c4b5e4eb..88fc9aa54fe0 100644
--- a/trunk/net/wireless/sme.c
+++ b/trunk/net/wireless/sme.c
@@ -234,7 +234,7 @@ void cfg80211_conn_work(struct work_struct *work)
 			wdev_unlock(wdev);
 			continue;
 		}
-		if (wdev->sme_state != CFG80211_SME_CONNECTING) {
+		if (wdev->sme_state != CFG80211_SME_CONNECTING || !wdev->conn) {
 			wdev_unlock(wdev);
 			continue;
 		}