Changeset 4798

Timestamp:

09/17/07 12:58:50 (6 years ago)

Author:

khali

Message:

Hide error on missing dme1737 fan and pwm.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/sensors/chips.c (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -20 +20 @@
   Program sensors: Fix a memory leak on error (with -u)
                    Add sch311x support
+                   Hide error on missing dme1737 fan and pwm
   Program sensors-detect: Don't probe i2c-isa as a regular i2c bus
                           Add Winbond W83L786NR/NG/R/G detection

lm-sensors/trunk/prog/sensors/chips.c

@@ -6017 +6017 @@
   if (!sensors_get_label_and_valid(*name, SENSORS_DME1737_IN(i), &label,
                                    &valid) &&
-      !sensors_get_feature(*name, SENSORS_DME1737_IN(i), &cur) &&
-      !sensors_get_feature(*name, SENSORS_DME1737_IN_MIN(i), &min) &&
-      !sensors_get_feature(*name, SENSORS_DME1737_IN_MAX(i), &max) &&
-      !sensors_get_feature(*name, SENSORS_DME1737_IN_ALARM(i), &alarm)) {
-    if (valid) {
+      valid) {
+    if (!sensors_get_feature(*name, SENSORS_DME1737_IN(i), &cur) &&
+        !sensors_get_feature(*name, SENSORS_DME1737_IN_MIN(i), &min) &&
+        !sensors_get_feature(*name, SENSORS_DME1737_IN_MAX(i), &max) &&
+        !sensors_get_feature(*name, SENSORS_DME1737_IN_ALARM(i), &alarm)) {
       print_label(label, 10);
       printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)  %s\n",
              cur, min, max, alarm ? "ALARM" : "");
-    }
-  } else {
-    printf("ERROR: Can't get in%d data!\n", i);
+    } else {
+      printf("ERROR: Can't get in%d data!\n", i);
+    }
   }
   free(label);
@@ -6040 +6040 @@
   if (!sensors_get_label_and_valid(*name, SENSORS_DME1737_TEMP(i), &label,
                                    &valid) &&
-      !sensors_get_feature(*name, SENSORS_DME1737_TEMP(i), &cur) &&
-      !sensors_get_feature(*name, SENSORS_DME1737_TEMP_MIN(i), &min) &&
-      !sensors_get_feature(*name, SENSORS_DME1737_TEMP_MAX(i), &max) &&
-      !sensors_get_feature(*name, SENSORS_DME1737_TEMP_ALARM(i), &alarm) &&
-      !sensors_get_feature(*name, SENSORS_DME1737_TEMP_FAULT(i), &fault)) {
-    if (valid) {
+      valid) {
+    if (!sensors_get_feature(*name, SENSORS_DME1737_TEMP(i), &cur) &&
+        !sensors_get_feature(*name, SENSORS_DME1737_TEMP_MIN(i), &min) &&
+        !sensors_get_feature(*name, SENSORS_DME1737_TEMP_MAX(i), &max) &&
+        !sensors_get_feature(*name, SENSORS_DME1737_TEMP_ALARM(i), &alarm) &&
+        !sensors_get_feature(*name, SENSORS_DME1737_TEMP_FAULT(i), &fault)) {
       print_label(label, 10);
       print_temp_info(cur, max, min, MINMAX, 0, 0);
       printf("%s%s\n", fault ? "FAULT  " : "", alarm ? "ALARM" : "");
-    }
-  } else {
-    printf("ERROR: Can't get temp%d data!\n", i);
+    } else {
+      printf("ERROR: Can't get temp%d data!\n", i);
+    }
   }
   free(label);
@@ -6072 +6072 @@
              cur, min, alarm ? "ALARM" : "");
     }
-  } else {
-    printf("ERROR: Can't get fan%d data!\n", i);
   }
   free(label);
@@ -6093 +6091 @@
       printf("%4.0f      (enable = %1.0f, freq = %6.0f Hz)\n", cur, enable, freq);
     }
-  } else {
-    printf("ERROR: Can't get pwm%d data!\n", i);
   }
   free(label);