aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-debugfs.c
diff options
context:
space:
mode:
authorDon Fry <donald.h.fry@intel.com>2012-03-15 16:27:05 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-04-09 16:37:47 -0400
commit17acd0b64e23d92013621dc2caa3042ce6769770 (patch)
treea4edbddf9a7a2a8a1b1b2115ac2af248da499e0a /drivers/net/wireless/iwlwifi/iwl-debugfs.c
parente3ec26de90c18b1b198f94f5b2444ba48cc6ce2d (diff)
iwlwifi: move FW_ERROR to priv
The op_mode should check for FW_ERROR before calling send_cmd. This removes the need to test for FW_ERROR in the trans layer. Signed-off-by: Don Fry <donald.h.fry@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-debugfs.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-debugfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index a2baf1756520..03fc27db72d1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -557,7 +557,7 @@ static ssize_t iwl_dbgfs_status_read(struct file *file,
557 pos += scnprintf(buf + pos, bufsz - pos, "STATUS_POWER_PMI:\t %d\n", 557 pos += scnprintf(buf + pos, bufsz - pos, "STATUS_POWER_PMI:\t %d\n",
558 test_bit(STATUS_POWER_PMI, &priv->shrd->status)); 558 test_bit(STATUS_POWER_PMI, &priv->shrd->status));
559 pos += scnprintf(buf + pos, bufsz - pos, "STATUS_FW_ERROR:\t %d\n", 559 pos += scnprintf(buf + pos, bufsz - pos, "STATUS_FW_ERROR:\t %d\n",
560 test_bit(STATUS_FW_ERROR, &priv->shrd->status)); 560 test_bit(STATUS_FW_ERROR, &priv->status));
561 return simple_read_from_buffer(user_buf, count, ppos, buf, pos); 561 return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
562} 562}
563 563