mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-10-22 11:46:03 +00:00
Add support for the new platform drivers (Linux 2.6, sysfs).
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@3224 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
1 parent
dcf611d1c7
commit
337ffc5729
1 file changed
+19
-16
+19
-16
@@ -71,24 +71,27 @@ static int sensors_read_one_sysfs_chip(struct sysfs_device *dev)
|
||||
if (!entry.name.busname)
|
||||
sensors_fatal_error(__FUNCTION__, "out of memory");
|
||||
|
||||
if (sscanf(dev->name, "%d-%x", &entry.name.bus, &entry.name.addr) != 2)
|
||||
if (sscanf(dev->name, "%d-%x", &entry.name.bus, &entry.name.addr) == 2) {
|
||||
/* find out if legacy ISA or not */
|
||||
snprintf(bus_path, sizeof(bus_path),
|
||||
"%s/class/i2c-adapter/i2c-%d/device/name",
|
||||
sensors_sysfs_mount, entry.name.bus);
|
||||
|
||||
if ((bus_attr = sysfs_open_attribute(bus_path))) {
|
||||
if (sysfs_read_attribute(bus_attr))
|
||||
return -SENSORS_ERR_PARSE;
|
||||
|
||||
if (bus_attr->value && !strncmp(bus_attr->value, "ISA ", 4))
|
||||
entry.name.bus = SENSORS_CHIP_NAME_BUS_ISA;
|
||||
|
||||
sysfs_close_attribute(bus_attr);
|
||||
}
|
||||
} else if (sscanf(dev->name, "%*[a-z0-9_].%d", &entry.name.addr) == 1) {
|
||||
/* must be new ISA (platform driver) */
|
||||
entry.name.bus = SENSORS_CHIP_NAME_BUS_ISA;
|
||||
} else
|
||||
return -SENSORS_ERR_PARSE;
|
||||
|
||||
/* find out if ISA or not */
|
||||
snprintf(bus_path, sizeof(bus_path),
|
||||
"%s/class/i2c-adapter/i2c-%d/device/name",
|
||||
sensors_sysfs_mount, entry.name.bus);
|
||||
|
||||
if ((bus_attr = sysfs_open_attribute(bus_path))) {
|
||||
if (sysfs_read_attribute(bus_attr))
|
||||
return -SENSORS_ERR_PARSE;
|
||||
|
||||
if (bus_attr->value && !strncmp(bus_attr->value, "ISA ", 4))
|
||||
entry.name.bus = SENSORS_CHIP_NAME_BUS_ISA;
|
||||
|
||||
sysfs_close_attribute(bus_attr);
|
||||
}
|
||||
|
||||
sensors_add_proc_chips(&entry);
|
||||
|
||||
return 0;
|
||||
|
||||
Reference in new issue
Block a user