Changeset 4154 for lm-sensors/trunk/prog/sensors/chips.c

Timestamp:

09/07/06 21:51:25 (6 years ago)

Author:

khali

Message:

vt1211 fixes:
* No in6
* More inputs can be missing (depends on UCH config)

Files:

• lm-sensors/trunk/prog/sensors/chips.c (modified) (7 diffs)

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

@@ -4424 +4424 @@
       printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
              cur,min,max,alarms&VT1211_ALARM_IN2?"ALARM":"");
-    } else
+    } else if (err != -SENSORS_ERR_PROC)
       printf("ERROR: Can't get IN2 data!\n");
   }
@@ -4437 +4437 @@
       printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
              cur,min,max,alarms&VT1211_ALARM_IN3?"ALARM":"");
-    } else
+    } else if (err != -SENSORS_ERR_PROC)
       printf("ERROR: Can't get IN3 data!\n");
   }
@@ -4450 +4450 @@
       printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
              cur,min,max,alarms&VT1211_ALARM_IN4?"ALARM":"");
-    } else
+    } else if (err != -SENSORS_ERR_PROC)
       printf("ERROR: Can't get IN4 data!\n");
   }
@@ -4463 +4463 @@
       printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
              cur,min,max,alarms&VT1211_ALARM_IN5?"ALARM":"");
-    } else
-      printf("ERROR: Can't get IN5 data!\n");
-  }
-  free(label);
+    }
+  }
+  free(label);
+
   if (sensors_get_label_and_valid(*name,SENSORS_VT1211_FAN1,&label,&valid)) {
     printf("ERROR: Can't get FAN1 config!\n");
@@ -4493 +4493 @@
   }
   free(label);
+
   if (sensors_get_label_and_valid(*name,SENSORS_VT1211_TEMP1,&label,&valid)) {
     printf("ERROR: Can't get TEMP1 config!\n");
@@ -4528 +4529 @@
       print_temp_info( cur, max, min, HYST, 1, 0);
       printf(" %s\n", alarms & VT1211_ALARM_TEMP3 ? "ALARM" : "" );
-    } else
+    } else if (err != -SENSORS_ERR_PROC)
       printf("ERROR: Can't get TEMP3 data!\n");
   }
@@ -4541 +4542 @@
       print_temp_info( cur, max, min, HYST, 1, 0);
       printf(" %s\n", alarms & VT1211_ALARM_TEMP4 ? "ALARM" : "" );
-    } else
+    } else if (err != -SENSORS_ERR_PROC)
       printf("ERROR: Can't get TEMP4 data!\n");
   }