2
0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-08-31 14:25:39 +00:00

Contrary to what the comment says, sensors_proc_bus_count may be a

perfectly valid bus number. We need to use a different value for
chip configuration entries we want to ignore.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4688 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare
2007-08-19 15:05:52 +00:00
parent a74addb5d4
commit f1cc941e29
2 changed files with 5 additions and 4 deletions

View File

@@ -192,7 +192,7 @@ int sensors_substitute_chip(sensors_chip_name *name, int lineno)
if (i == sensors_config_busses_count) {
sensors_parse_error("Undeclared bus id referenced", lineno);
name->bus.nr = sensors_proc_bus_count;
name->bus.nr = SENSORS_BUS_NR_IGNORE;
return -SENSORS_ERR_BUS_NAME;
}
@@ -205,9 +205,9 @@ int sensors_substitute_chip(sensors_chip_name *name, int lineno)
}
}
/* We did not find anything. sensors_proc_bus_count is not
a valid bus number, so it will never be matched. Good. */
name->bus.nr = sensors_proc_bus_count;
/* We did not find a matching bus name, simply ignore this chip
config entry. */
name->bus.nr = SENSORS_BUS_NR_IGNORE;
return 0;
}

View File

@@ -34,6 +34,7 @@
#define SENSORS_BUS_TYPE_ISA 1
#define SENSORS_BUS_TYPE_PCI 2
#define SENSORS_BUS_NR_ANY (-1)
#define SENSORS_BUS_NR_IGNORE (-2)
#ifdef __cplusplus
extern "C" {