---

yaml --- r: 314012 b: refs/heads/master c: 3b08cf6 h: refs/heads/master v: v3
git-mirror · Jun 6, 2012 · 1e5bd75 · 1e5bd75
1 parent 43cacbf
commit 1e5bd75
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c06e8c08e25da6c147c30717aecfcfe3bdcb758
+refs/heads/master: 3b08cf6bd2763bfe9d04fad4d7de29ee7735cd76
diff --git a/trunk/net/mac80211/pm.c b/trunk/net/mac80211/pm.c
@@ -77,6 +77,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
 		int err = drv_suspend(local, wowlan);
 		if (err < 0) {
 			local->quiescing = false;
+			local->wowlan = false;
 			return err;
 		} else if (err > 0) {
 			WARN_ON(err != 1);