From 537730afcb52a99dbf7ede062d92f18bc55a40ef Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 10 Oct 2011 07:26:57 -0700
Subject: [PATCH] --- yaml --- r: 266735 b: refs/heads/master c:
 d36120c6259e0d5bc435b8b690f73907357c26fb h: refs/heads/master i:   266733:
 715123e2fb2ab614976001ee6050a9646ace3964   266731:
 a44ef94a920bf176b10ea3a810dad99b49d404a0   266727:
 f1c3b82d68fded838b95dc014a27d09f439c9dc7   266719:
 bb1f479beabc727cff4df4340240889ba3ac29ad v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 10aa6f47a2d1..a2f5f32a1fa9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26bfc0cfdb6b9a12911f8dde4f96c958aef357ae
+refs/heads/master: d36120c6259e0d5bc435b8b690f73907357c26fb
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index 60a8eccb7133..60067c7f0de0 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -1377,8 +1377,13 @@ static int iwl_trans_pcie_suspend(struct iwl_trans *trans)
 	 * But of course ... if we have configured WoWLAN then we did other
 	 * things already :-)
 	 */
-	if (!trans->shrd->wowlan)
+	if (!trans->shrd->wowlan) {
 		iwl_apm_stop(priv(trans));
+	} else {
+		iwl_disable_interrupts(trans);
+		iwl_clear_bit(bus(trans), CSR_GP_CNTRL,
+			      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+	}
 
 	return 0;
 }