Merge tag 'wireless-drivers-next-for-davem-2015-10-27' of git://git.kernel.org/pub...

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / ath / ath6kl / cfg80211.c

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 3fda750db2a90d571fb1bb506ea543e5cc160e2f..76b682e566ab217f842648cbd3e4e0177d3ef1da 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -2217,7 +2217,7 @@ static int ath6kl_wow_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow)
 
        /* enter / leave wow suspend on first vif always */
        first_vif = ath6kl_vif_first(ar);
-       if (WARN_ON(unlikely(!first_vif)) ||
+       if (WARN_ON(!first_vif) ||
            !ath6kl_cfg80211_ready(first_vif))
                return -EIO;
 
@@ -2297,7 +2297,7 @@ static int ath6kl_wow_resume(struct ath6kl *ar)
        int ret;
 
        vif = ath6kl_vif_first(ar);
-       if (WARN_ON(unlikely(!vif)) ||
+       if (WARN_ON(!vif) ||
            !ath6kl_cfg80211_ready(vif))
                return -EIO;