From bf96a279b8aa3357293078bfab269c8c9dbdabf4 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 8 Oct 2006 15:45:15 +0000 Subject: [PATCH] libsensors: Probe for busses before chips. This makes more sense that way, and may allow for cleanups later. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4198 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + lib/init.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index b638b89d..135c3595 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,7 @@ lm_sensors CHANGES file SVN HEAD Library: Add support for the pc87247 driver (fans only) + Probe for busses before chips Module icspll: Delete. It was useless and dangerous. Program sensord: Add pc87247 support (fans only) Program sensors: Add pc87247 support (fans only) diff --git a/lib/init.c b/lib/init.c index 863c020e..bbf4d768 100644 --- a/lib/init.c +++ b/lib/init.c @@ -43,10 +43,10 @@ int sensors_init(FILE *input) int res; sensors_cleanup(); if (sensors_init_sysfs()) { - if ((res = sensors_read_sysfs_chips()) || (res = sensors_read_sysfs_bus())) + if ((res = sensors_read_sysfs_bus()) || (res = sensors_read_sysfs_chips())) return res; } else { - if ((res = sensors_read_proc_chips()) || (res = sensors_read_proc_bus())) + if ((res = sensors_read_proc_bus()) || (res = sensors_read_proc_chips())) return res; } if ((res = sensors_scanner_init(input)))