From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
ipw3945-devel@lists.sourceforge.net,
Johannes Berg <johannes.berg@intel.com>,
Wey-Yi Guy <wey-yi.w.guy@intel.com>
Subject: [PATCH 4/5] iwlagn: return error if PAN disable timeout
Date: Tue, 4 Jan 2011 16:22:02 -0800 [thread overview]
Message-ID: <1294186923-4582-5-git-send-email-wey-yi.w.guy@intel.com> (raw)
In-Reply-To: <1294186923-4582-1-git-send-email-wey-yi.w.guy@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 99e9650..6e80f10 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -74,8 +74,10 @@ static int iwlagn_disable_pan(struct iwl_priv *priv,
signed long wait_res;
wait_res = iwlagn_wait_notification(priv, &disable_wait, HZ);
- if (wait_res == 0)
+ if (wait_res == 0) {
IWL_ERR(priv, "Timed out waiting for PAN disable\n");
+ ret = -EIO;
+ }
}
return ret;
--
1.7.0.4
next prev parent reply other threads:[~2011-01-05 0:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-05 0:21 [PATCH 0/5] update for 2.6.38 Wey-Yi Guy
2011-01-05 0:21 ` [PATCH 1/5] iwlagn: make iwl_rx_handle static Wey-Yi Guy
2011-01-05 0:22 ` [PATCH 2/5] iwlagn: add support for waiting for notifications Wey-Yi Guy
2011-01-05 0:22 ` [PATCH 3/5] iwlagn: properly wait for PAN disable Wey-Yi Guy
2011-01-05 0:22 ` Wey-Yi Guy [this message]
2011-01-05 0:22 ` [PATCH 5/5] iwlwifi: fix 4965 notification wait setup Wey-Yi Guy
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=1294186923-4582-5-git-send-email-wey-yi.w.guy@intel.com \
--to=wey-yi.w.guy@intel.com \
--cc=ipw3945-devel@lists.sourceforge.net \
--cc=johannes.berg@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.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