aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-01-15 16:43:36 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-01-19 16:25:10 -0500
commit937c397eb633b804d9a806d08c395ecfc42b1fec (patch)
treea9a24507cd22b1bb7e77eb2840e66cc9ad88ae0d /drivers/net/wireless/iwlwifi/iwl-agn.c
parent11fc524941248dc717f1af5dfa844eceb7c0217f (diff)
iwlwifi: correct return code for log_event
When dumping event log in debugfs, iwl_dump_nic_event_log() should return the correct error code instead of let the calling function makes it own assumption. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index c78063312ea..eaa309d8bee 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1965,7 +1965,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
1965 IWL_ERR(priv, 1965 IWL_ERR(priv,
1966 "Invalid event log pointer 0x%08X for %s uCode\n", 1966 "Invalid event log pointer 0x%08X for %s uCode\n",
1967 base, (priv->ucode_type == UCODE_INIT) ? "Init" : "RT"); 1967 base, (priv->ucode_type == UCODE_INIT) ? "Init" : "RT");
1968 return pos; 1968 return -EINVAL;
1969 } 1969 }
1970 1970
1971 /* event log header */ 1971 /* event log header */
@@ -2013,7 +2013,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
2013 bufsz = size * 48; 2013 bufsz = size * 48;
2014 *buf = kmalloc(bufsz, GFP_KERNEL); 2014 *buf = kmalloc(bufsz, GFP_KERNEL);
2015 if (!*buf) 2015 if (!*buf)
2016 return pos; 2016 return -ENOMEM;
2017 } 2017 }
2018 if ((iwl_get_debug_level(priv) & IWL_DL_FW_ERRORS) || full_log) { 2018 if ((iwl_get_debug_level(priv) & IWL_DL_FW_ERRORS) || full_log) {
2019 /* 2019 /*