Merge tag 'upstream/3.0.3'

Upstream version 3.0.3

1 files changed, 10 insertions, 3 deletions

diff --git a/util/oem_hp.c b/util/oem_hp.c
index 4c5b4f9..b7f7d07 100644
--- a/util/oem_hp.c
+++ b/util/oem_hp.c
@@ -83,10 +83,17 @@ int decode_sensor_hp(uchar *sdr,uchar *reading,char *pstring, int slen)
       strncpy(pstring,"na",slen);    /*oem*/
       rv = 0;
    } else {
-      if ((reading[2] & 0x40) == 0x40) {  /*Init/Unavail state*/
-	   strncpy(pstring,"Init",slen);
+#ifdef OLD
+   int vend, prod;
+   get_mfgid(&vend,&prod);
+	  /* This was an anomaly for an older HP DL380 but is no longer valid */
+      if ((prod == 0x2000) && ((reading[2] & 0x40) == 0x40)) { 
+	   /*custom Init/Unavail state if DL380*/
+	   strncpy(pstring,"Init",slen); 
 	   rv = 0;
-      } else if (evtype == 0x6f) { /*evtype==0x6f special*/
+      } else 
+#endif
+      if (evtype == 0x6f) { /*evtype==0x6f special*/
 	   pstr = "DiscreteEvt";
            if (stype == 0x08) {  /*Power Supply presence*/
               if (reading[2] & 0x01) pstr = "Present";