diff --git a/[refs] b/[refs] index 32929a1aed99..ede194a49467 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e5db0a8454b44bf88fa74cf437a507ec08f436d +refs/heads/master: d4b1a6876f99ae1886cd254f649506af6692ac9f diff --git a/trunk/net/wireless/sme.c b/trunk/net/wireless/sme.c index 10ed36621bd7..e7a8851093a7 100644 --- a/trunk/net/wireless/sme.c +++ b/trunk/net/wireless/sme.c @@ -227,7 +227,7 @@ static void __cfg80211_sme_scan_done(struct net_device *dev) if (wdev->sme_state != CFG80211_SME_CONNECTING) return; - if (WARN_ON(!wdev->conn)) + if (!wdev->conn) return; if (wdev->conn->state != CFG80211_CONN_SCANNING &&