From 63543dd54424d79c3e1fa0b9dcb4c2feda1c7e80 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 25 Jun 2010 07:06:29 +0000 Subject: [PATCH] --- yaml --- r: 203175 b: refs/heads/master c: bd97a63f7d9892b4536f331d263c2695cc52d08c h: refs/heads/master i: 203173: e4ae7d40f6daade69000d03ceacb252841b221b5 203171: a56ac957703b874fe8e672fbaf654403e998bde0 203167: 70a88e9f52e43da9dd65d8e7f05d69feb8d29407 v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/falcon_boards.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2612308914b3..296cbbbfa948 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 477e54eba4fd092704e50e65ade79463bd17fa85 +refs/heads/master: bd97a63f7d9892b4536f331d263c2695cc52d08c diff --git a/trunk/drivers/net/sfc/falcon_boards.c b/trunk/drivers/net/sfc/falcon_boards.c index 92b35e3d1100..3d950c2cf205 100644 --- a/trunk/drivers/net/sfc/falcon_boards.c +++ b/trunk/drivers/net/sfc/falcon_boards.c @@ -108,10 +108,15 @@ static int efx_check_lm87(struct efx_nic *efx, unsigned mask) if (alarms1 || alarms2) { netif_err(efx, hw, efx->net_dev, "LM87 detected a hardware failure (status %02x:%02x)" - "%s%s\n", + "%s%s%s\n", alarms1, alarms2, - (alarms1 & LM87_ALARM_TEMP_INT) ? " INTERNAL" : "", - (alarms1 & LM87_ALARM_TEMP_EXT1) ? " EXTERNAL" : ""); + (alarms1 & LM87_ALARM_TEMP_INT) ? + "; board is overheating" : "", + (alarms1 & LM87_ALARM_TEMP_EXT1) ? + "; controller is overheating" : "", + (alarms1 & ~(LM87_ALARM_TEMP_INT | LM87_ALARM_TEMP_EXT1) + || alarms2) ? + "; electrical fault" : ""); return -ERANGE; }