|
 |
6569a90 |
From 8ca95995e64f5d270889badb3e449dca91106a2b Mon Sep 17 00:00:00 2001
|
|
|
6569a90 |
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
|
|
6569a90 |
Date: Sun, 15 Sep 2013 11:37:17 +0300
|
|
|
6569a90 |
Subject: [PATCH] iwlwifi: don't WARN on host commands sent when firmware is dead
|
|
|
6569a90 |
|
|
|
6569a90 |
This triggers automatic bug reports and add no valuable
|
|
|
6569a90 |
information. Print a simple error instead and drop the
|
|
|
6569a90 |
host command.
|
|
|
6569a90 |
|
|
|
6569a90 |
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
|
|
6569a90 |
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
6569a90 |
---
|
|
|
6569a90 |
drivers/net/wireless/iwlwifi/iwl-trans.h | 6 ++++--
|
|
|
6569a90 |
1 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
6569a90 |
|
|
|
6569a90 |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
|
|
|
6569a90 |
index dd57a36..80b4750 100644
|
|
|
6569a90 |
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
|
|
|
6569a90 |
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
|
|
|
6569a90 |
@@ -601,8 +601,10 @@ static inline int iwl_trans_send_cmd(struct iwl_trans *trans,
|
|
|
6569a90 |
{
|
|
|
6569a90 |
int ret;
|
|
|
6569a90 |
|
|
|
6569a90 |
- WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,
|
|
|
6569a90 |
- "%s bad state = %d", __func__, trans->state);
|
|
|
6569a90 |
+ if (trans->state != IWL_TRANS_FW_ALIVE) {
|
|
|
6569a90 |
+ IWL_ERR(trans, "%s bad state = %d", __func__, trans->state);
|
|
|
6569a90 |
+ return -EIO;
|
|
|
6569a90 |
+ }
|
|
|
6569a90 |
|
|
|
6569a90 |
if (!(cmd->flags & CMD_ASYNC))
|
|
|
6569a90 |
lock_map_acquire_read(&trans->sync_cmd_lockdep_map);
|
|
|
6569a90 |
--
|
|
|
6569a90 |
1.7.1
|
|
|
6569a90 |
|