aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2009-07-17 12:30:25 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-24 15:05:25 -0400
commit58dba728b1b727cb3d95a1f76ca4e88a1e628ee1 (patch)
treef41583e82473027cafd75545ffe81718a6055872 /drivers
parenta562a9dda7f47e7cac58d80bf1ffe441feca510e (diff)
iwlwifi: clarify hardware error message
When a hardware error is detected we need to be clear about that and not create impression that the microcode is able to deal with it. Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index ff4a546f1e6d..b7ac4ee794c0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -923,7 +923,7 @@ static void iwl_irq_tasklet_legacy(struct iwl_priv *priv)
923 923
924 /* Now service all interrupt bits discovered above. */ 924 /* Now service all interrupt bits discovered above. */
925 if (inta & CSR_INT_BIT_HW_ERR) { 925 if (inta & CSR_INT_BIT_HW_ERR) {
926 IWL_ERR(priv, "Microcode HW error detected. Restarting.\n"); 926 IWL_ERR(priv, "Hardware error detected. Restarting.\n");
927 927
928 /* Tell the device to stop sending interrupts */ 928 /* Tell the device to stop sending interrupts */
929 iwl_disable_interrupts(priv); 929 iwl_disable_interrupts(priv);
@@ -1096,7 +1096,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
1096 1096
1097 /* Now service all interrupt bits discovered above. */ 1097 /* Now service all interrupt bits discovered above. */
1098 if (inta & CSR_INT_BIT_HW_ERR) { 1098 if (inta & CSR_INT_BIT_HW_ERR) {
1099 IWL_ERR(priv, "Microcode HW error detected. Restarting.\n"); 1099 IWL_ERR(priv, "Hardware error detected. Restarting.\n");
1100 1100
1101 /* Tell the device to stop sending interrupts */ 1101 /* Tell the device to stop sending interrupts */
1102 iwl_disable_interrupts(priv); 1102 iwl_disable_interrupts(priv);
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 221a875b0161..8891d6e3a0fa 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -1663,7 +1663,7 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv)
1663 1663
1664 /* Now service all interrupt bits discovered above. */ 1664 /* Now service all interrupt bits discovered above. */
1665 if (inta & CSR_INT_BIT_HW_ERR) { 1665 if (inta & CSR_INT_BIT_HW_ERR) {
1666 IWL_ERR(priv, "Microcode HW error detected. Restarting.\n"); 1666 IWL_ERR(priv, "Hardware error detected. Restarting.\n");
1667 1667
1668 /* Tell the device to stop sending interrupts */ 1668 /* Tell the device to stop sending interrupts */
1669 iwl_disable_interrupts(priv); 1669 iwl_disable_interrupts(priv);