diff options
author | Mark M. Hoffman <mhoffman@lightlink.com> | 2005-09-18 20:38:19 +0000 |
---|---|---|
committer | Mark M. Hoffman <mhoffman@lightlink.com> | 2005-09-18 20:38:19 +0000 |
commit | 85a0c8ccb2928b912084a091328db9d3da5722b0 (patch) | |
tree | d7a37a41ba6bcded7ff46b06396f01a8ed2b94d6 /lib/init.c | |
parent | c277761d1515cb514276bc0416a4c5b03a579f9f (diff) | |
download | lm-sensors-git-85a0c8ccb2928b912084a091328db9d3da5722b0.tar.gz |
(mmh)
This patch replaces the I2C chip enumeration (through sysfs) in lib/proc.c
with new functions in lib/sysfs (using libsysfs). The patch also updates
the init code accordingly.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@3095 7894878c-1315-0410-8ee3-d5d059ff63e0
Diffstat (limited to 'lib/init.c')
-rw-r--r-- | lib/init.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -41,13 +41,11 @@ int sensors_init(FILE *input) { int res; sensors_cleanup(); - if ((res = sensors_read_proc_chips())) - return res; if (sensors_init_sysfs()) { - if ((res = sensors_read_sysfs_bus())) + if ((res = sensors_read_sysfs_chips()) || (res = sensors_read_sysfs_bus())) return res; } else { - if ((res = sensors_read_proc_bus())) + if ((res = sensors_read_proc_chips()) || (res = sensors_read_proc_bus())) return res; } sensors_yyin = input; |