From dd5890e16d7451e666f1f98771be9cfd1fcf0fb9 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Wed, 7 Mar 2012 09:52:23 -0800
Subject: [PATCH] --- yaml --- r: 291306 b: refs/heads/master c:
 aa5affbacb24cb5d8fd6f7c66e57d62164ed6d34 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-io.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4b10ef352935..e3e706b12be2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9441b85d59ec9d06cbe749e12a59a06c09e601fa
+refs/heads/master: aa5affbacb24cb5d8fd6f7c66e57d62164ed6d34
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-io.c b/trunk/drivers/net/wireless/iwlwifi/iwl-io.c
index e2e3b5c9cf7f..fc365350a3e7 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -121,10 +121,10 @@ int iwl_grab_nic_access_silent(struct iwl_trans *trans)
 int iwl_grab_nic_access(struct iwl_trans *trans)
 {
 	int ret = iwl_grab_nic_access_silent(trans);
-	if (ret) {
+	if (unlikely(ret)) {
 		u32 val = iwl_read32(trans, CSR_GP_CNTRL);
-		IWL_ERR(trans,
-			"MAC is in deep sleep!. CSR_GP_CNTRL = 0x%08X\n", val);
+		WARN_ONCE(1, "Timeout waiting for hardware access "
+			     "(CSR_GP_CNTRL 0x%08x)\n", val);
 	}
 
 	return ret;