From: Stanislaw Gruszka <sgruszka@redhat.com>
To: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Cc: Intel Linux Wireless <ilw@linux.intel.com>,
linux-wireless@vger.kernel.org,
Stanislaw Gruszka <sgruszka@redhat.com>
Subject: [PATCH 5/6] iwlwifi: print DMA stop timeout message only if that error happened
Date: Thu, 23 Feb 2012 11:16:07 +0100 [thread overview]
Message-ID: <1329992168-19990-5-git-send-email-sgruszka@redhat.com> (raw)
In-Reply-To: <1329992168-19990-1-git-send-email-sgruszka@redhat.com>
iwl_poll_direct_bit() return negative error value on timeout, positive
values does not indicate an error.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index b6909b4..a0e716f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -1209,7 +1209,7 @@ static void iwl_trans_pcie_fw_alive(struct iwl_trans *trans)
*/
static int iwl_trans_tx_stop(struct iwl_trans *trans)
{
- int ch, txq_id;
+ int ch, txq_id, ret;
unsigned long flags;
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
@@ -1222,9 +1222,10 @@ static int iwl_trans_tx_stop(struct iwl_trans *trans)
for (ch = 0; ch < FH_TCSR_CHNL_NUM; ch++) {
iwl_write_direct32(trans,
FH_TCSR_CHNL_TX_CONFIG_REG(ch), 0x0);
- if (iwl_poll_direct_bit(trans, FH_TSSR_TX_STATUS_REG,
+ ret = iwl_poll_direct_bit(trans, FH_TSSR_TX_STATUS_REG,
FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch),
- 1000))
+ 1000);
+ if (ret < 0)
IWL_ERR(trans, "Failing on timeout while stopping"
" DMA channel %d [0x%08x]", ch,
iwl_read_direct32(trans,
--
1.7.1
next prev parent reply other threads:[~2012-02-23 10:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-23 10:16 [PATCH 1/6] iwlwifi: dump stack when fail to gain access to the device Stanislaw Gruszka
2012-02-23 10:16 ` [PATCH 2/6] iwlwifi: always check if got h/w access before write Stanislaw Gruszka
2012-02-23 10:16 ` [PATCH 3/6] iwlwifi: cleanup/fix memory barriers Stanislaw Gruszka
2012-02-23 12:22 ` Johannes Berg
2012-02-23 10:16 ` [PATCH 4/6] iwlwifi: use writeb,writel,readl directly Stanislaw Gruszka
2012-02-23 12:23 ` Johannes Berg
2012-02-23 10:16 ` Stanislaw Gruszka [this message]
2012-02-23 10:16 ` [PATCH 6/6] iwlwifi: reintroduce iwl_enable_rfkill_int Stanislaw Gruszka
2012-02-23 12:22 ` [PATCH 1/6] iwlwifi: dump stack when fail to gain access to the device Johannes Berg
2012-02-23 14:55 ` Guy, Wey-Yi
2012-02-24 9:32 ` Stanislaw Gruszka
2012-02-24 14:45 ` Guy, Wey-Yi
2012-02-24 16:01 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329992168-19990-5-git-send-email-sgruszka@redhat.com \
--to=sgruszka@redhat.com \
--cc=ilw@linux.intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=wey-yi.w.guy@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).