mac80211: be more careful in suspend/resume

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / mac80211 / pm.c

diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index 67839eb90cc178dca9de0be7ee21fe7a4d26e180..6326d3439861e7448dec7a2f1cb08dee8d10988e 100644 (file)
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -34,6 +34,9 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
        struct ieee80211_sub_if_data *sdata;
        struct sta_info *sta;
 
+       if (!local->open_count)
+               goto suspend;
+
        ieee80211_scan_cancel(local);
 
        if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {
@@ -72,15 +75,19 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
        local->wowlan = wowlan && local->open_count;
        if (local->wowlan) {
                int err = drv_suspend(local, wowlan);
-               if (err) {
+               if (err < 0) {
                        local->quiescing = false;
                        return err;
+               } else if (err > 0) {
+                       WARN_ON(err != 1);
+                       local->wowlan = false;
+               } else {
+                       list_for_each_entry(sdata, &local->interfaces, list) {
+                               cancel_work_sync(&sdata->work);
+                               ieee80211_quiesce(sdata);
+                       }
+                       goto suspend;
                }
-               list_for_each_entry(sdata, &local->interfaces, list) {
-                       cancel_work_sync(&sdata->work);
-                       ieee80211_quiesce(sdata);
-               }
-               goto suspend;
        }
 
        /* disable keys */