Changeset 4326

Timestamp:

02/15/07 12:58:53 (6 years ago)

Author:

khali

Message:

libsensors: Do not skip i2c adapters with only a class device and no
physical device. This change is required to survive the planned struct
class_dev removal from future 2.6 kernels.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• lib/sysfs.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -3 +3 @@
 
 SVN HEAD
+  Library: Do not skip i2c adapters with only a class device and no
+            physical device. This change is required to survive the
+            planned struct class_dev removal from future 2.6 kernels.
   Man page i2cdetect.8: Scanning range can be restricted
   Module bmcsensors: Fix debugging messages

lm-sensors/trunk/lib/sysfs.c

@@ -196 +196 @@
                 struct sysfs_attribute *attr;
 
-                if (!(dev = sysfs_get_classdev_device(clsdev)))
-                        continue;
                 /* Get the adapter name from the classdev "name" attribute
                  * (Linux 2.6.20 and later). If it fails, fall back to
                  * the device "name" attribute (for older kernels). */
                 if (!(attr = sysfs_get_classdev_attr(clsdev, "name"))
-                 && !(attr = sysfs_get_device_attr(dev, "name")))
+                 && !((dev = sysfs_get_classdev_device(clsdev)) &&
+                      (attr = sysfs_get_device_attr(dev, "name"))))
                         continue;