Lines 67-80
Link Here
|
67 |
|
67 |
|
68 |
int sensors_init(FILE *input) |
68 |
int sensors_init(FILE *input) |
69 |
{ |
69 |
{ |
70 |
int res; |
70 |
int res, res2; |
71 |
sensors_cleanup(); |
71 |
sensors_cleanup(); |
72 |
if (sensors_init_sysfs()) { |
72 |
if (sensors_init_sysfs()) { |
73 |
if ((res = sensors_read_sysfs_bus()) || (res = sensors_read_sysfs_chips())) |
73 |
res = sensors_read_sysfs_bus(); |
74 |
return res; |
74 |
res2 = sensors_read_sysfs_chips(); |
|
|
75 |
if (res && res2) { |
76 |
if (res) |
77 |
return res; |
78 |
if (res2) |
79 |
return res2; |
80 |
} |
75 |
} else { |
81 |
} else { |
76 |
if ((res = sensors_read_proc_bus()) || (res = sensors_read_proc_chips())) |
82 |
res = sensors_read_proc_bus(); |
77 |
return res; |
83 |
res2 = sensors_read_proc_chips(); |
|
|
84 |
if (res && res2) { |
85 |
if (res) |
86 |
return res; |
87 |
if (res2) |
88 |
return res2; |
89 |
} |
78 |
} |
90 |
} |
79 |
if ((res = sensors_scanner_init(input))) |
91 |
if ((res = sensors_scanner_init(input))) |
80 |
return -SENSORS_ERR_PARSE; |
92 |
return -SENSORS_ERR_PARSE; |