Changeset 5145

Timestamp:

03/16/08 13:51:18 (4 years ago)

Author:

jwrdegoede

Message:

The platform case
acts as a fallback solution so it must be last in the list.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c (modified) (2 diffs)

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

@@ -525 +525 @@
                 entry.chip.bus.type = SENSORS_BUS_TYPE_SPI;
         } else
+        if ((!subsys || !strcmp(subsys, "pci")) &&
+            sscanf(dev_name, "%x:%x:%x.%x", &domain, &bus, &slot, &fn) == 4) {
+                /* PCI */
+                entry.chip.addr = (domain << 16) + (bus << 8) + (slot << 3) + fn;
+                entry.chip.bus.type = SENSORS_BUS_TYPE_PCI;
+                entry.chip.bus.nr = 0;
+        } else
         if ((!subsys || !strcmp(subsys, "platform"))) {
                 /* must be new ISA (platform driver) */
@@ -530 +537 @@
                         entry.chip.addr = 0;
                 entry.chip.bus.type = SENSORS_BUS_TYPE_ISA;
-                entry.chip.bus.nr = 0;
-        } else
-        if ((!subsys || !strcmp(subsys, "pci")) &&
-            sscanf(dev_name, "%x:%x:%x.%x", &domain, &bus, &slot, &fn) == 4) {
-                /* PCI */
-                entry.chip.addr = (domain << 16) + (bus << 8) + (slot << 3) + fn;
-                entry.chip.bus.type = SENSORS_BUS_TYPE_PCI;
                 entry.chip.bus.nr = 0;
         } else {