From a7f661eb0e2e02392a8f79e747502f3cdf9bbaf7 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Mon, 13 Feb 2012 11:23:08 +0100 Subject: [PATCH] --- yaml --- r: 290627 b: refs/heads/master c: b6603036ad87244bd39ed7bc0612009df7694f5e h: refs/heads/master i: 290625: 048b6f128899f27b6783306c55914a32f1ee3afe 290623: 4fd50bf44b784697be5842ded8f23b34d51b88aa v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlegacy/common.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f4aa02ef7d2c..e7ed3eaf8446 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fccdcf5091eaaa0d7582bedbc035163b40714b9 +refs/heads/master: b6603036ad87244bd39ed7bc0612009df7694f5e diff --git a/trunk/drivers/net/wireless/iwlegacy/common.c b/trunk/drivers/net/wireless/iwlegacy/common.c index 04ec38e5eaaf..3900967a79f6 100644 --- a/trunk/drivers/net/wireless/iwlegacy/common.c +++ b/trunk/drivers/net/wireless/iwlegacy/common.c @@ -111,9 +111,10 @@ _il_grab_nic_access(struct il_priv *il) _il_poll_bit(il, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN, (CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY | CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 15000); - if (ret < 0) { + if (unlikely(ret < 0)) { val = _il_rd(il, CSR_GP_CNTRL); - IL_ERR("MAC is in deep sleep!. CSR_GP_CNTRL = 0x%08X\n", val); + WARN_ONCE(1, "Timeout waiting for ucode processor access " + "(CSR_GP_CNTRL 0x%08x)\n", val); _il_wr(il, CSR_RESET, CSR_RESET_REG_FLAG_FORCE_NMI); return -EIO; }