Changeset 4637

Timestamp:

07/21/07 11:28:12 (6 years ago)

Author:

khali

Message:

Discard devices with zero feature.

Location:

lm-sensors/branches/lm-sensors-3.0.0/lib

Files:

• access.c (modified) (1 diff)
• sysfs.c (modified) (4 diffs)

lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

@@ -348 +348 @@
                         feature_list = sensors_proc_chips[i].feature;
                         if (!*nr1 && !*nr2) {   /* Return the first entry */
-                                if (!feature_list[0].data.name) /* The list may be empty */
-                                        return NULL;
                                 *nr1 = *nr2 = 1;
                                 return &feature_list->data;

lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c

@@ -167 +167 @@
         }
 
+        if (fnum == 1) { /* No feature */
+                chip->feature = NULL;
+                return 0;
+        }
+
         dyn_features = calloc(fnum, sizeof(sensors_chip_feature));
         if (dyn_features == NULL) {
@@ -204 +209 @@
 {
         int domain, bus, slot, fn;
+        int err = -SENSORS_ERR_PARSE;
         struct sysfs_attribute *attr, *bus_attr;
         char bus_path[SYSFS_PATH_MAX];
@@ -260 +266 @@
         if (sensors_read_dynamic_chip(&entry, dev) < 0)
                 goto exit_free;
+        if (!entry.feature) { /* No feature, discard chip */
+                err = 0;
+                goto exit_free;
+        }
         sensors_add_proc_chips(&entry);
 
@@ -267 +277 @@
         free(entry.chip.prefix);
         free(entry.chip.busname);
-        return -SENSORS_ERR_PARSE;
+        return err;
 }