mirror of
https://github.com/lm-sensors/lm-sensors
synced 2025-08-30 22:05:11 +00:00
Don't handle the isa bus in sensors_parse_i2cbus_name(). We really
don't need to, as there is a single ISA bus, there's no need for substituting anything. git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4674 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
@@ -190,10 +190,6 @@ int sensors_parse_i2cbus_name(const char *name, int *res)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (! strcmp(name,"isa")) {
|
||||
*res = SENSORS_CHIP_NAME_BUS_ISA;
|
||||
return 0;
|
||||
}
|
||||
if (strncmp(name,"i2c-",4)) {
|
||||
return -SENSORS_ERR_BUS_NAME;
|
||||
}
|
||||
|
10
lib/sysfs.c
10
lib/sysfs.c
@@ -374,17 +374,15 @@ int sensors_read_sysfs_bus(void)
|
||||
(attr = sysfs_get_device_attr(dev, "name"))))
|
||||
continue;
|
||||
|
||||
if (sscanf(clsdev->name, "i2c-%d", &entry.number) != 1 ||
|
||||
entry.number == 9191) /* legacy ISA */
|
||||
continue;
|
||||
|
||||
/* NB: attr->value[attr->len-1] == '\n'; chop that off */
|
||||
entry.adapter = strndup(attr->value, attr->len - 1);
|
||||
if (!entry.adapter)
|
||||
sensors_fatal_error(__FUNCTION__, "out of memory");
|
||||
|
||||
if (!strncmp(entry.adapter, "ISA ", 4)) {
|
||||
entry.number = SENSORS_CHIP_NAME_BUS_ISA;
|
||||
} else if (sscanf(clsdev->name, "i2c-%d", &entry.number) != 1) {
|
||||
continue;
|
||||
}
|
||||
|
||||
sensors_add_proc_bus(&entry);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user