From 1e5bd75f3ca252adf10faa62c5da50ee077469b5 Mon Sep 17 00:00:00 2001
From: Pontus Fuchs <pontus.fuchs@gmail.com>
Date: Thu, 31 May 2012 12:34:47 +0200
Subject: [PATCH] --- yaml --- r: 314012 b: refs/heads/master c:
 3b08cf6bd2763bfe9d04fad4d7de29ee7735cd76 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/pm.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d41984b99509..96f6caa7d901 100644
--- 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
index af1c4e26e965..98c128be3827 100644
--- 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);