---

yaml --- r: 266735 b: refs/heads/master c: d36120c h: refs/heads/master i: 266733: 715123e 266731: a44ef94 266727: f1c3b82 266719: bb1f479 v: v3
git-mirror · Oct 14, 2011 · 537730a · 537730a
1 parent 7b3f8f6
commit 537730a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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;
 }