summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>2008-12-01 13:13:36 +0000
committerkhali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>2008-12-01 13:13:36 +0000
commite89397eea5d1f028b275eec984762f69c4d34178 (patch)
tree0fc1a14ad2af4313ab6457791b1317982825714d
parentafe324e68c3f0f74e88f88985095151796e553a6 (diff)
downloadlm-sensors-e89397eea5d1f028b275eec984762f69c4d34178.tar.gz
More consistency in lm90_detect.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5484 7894878c-1315-0410-8ee3-d5d059ff63e0
-rwxr-xr-xprog/detect/sensors-detect15
1 files changed, 5 insertions, 10 deletions
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index 40db9be7..55e0d12e 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -3455,8 +3455,7 @@ sub lm90_detect
return if ($conf & 0x07) != 0;
return if $rate > 0x07;
return if $mid != 0x4d; # Maxim
- return if $cid != 0x08; # MAX6654/MAX6690
- return 8;
+ return 8 if $cid == 0x08; # MAX6654/MAX6690
}
if ($chip == 5) {
return if ($conf & 0x1b) != 0;
@@ -3468,29 +3467,25 @@ sub lm90_detect
return if ($conf & 0x3f) != 0;
return if $rate > 0x07;
return if $mid != 0x4d; # Maxim
- return if $cid != 0x59; # MAX6648/MAX6692
- return 8;
+ return 8 if $cid == 0x59; # MAX6648/MAX6692
}
if ($chip == 7) {
return if ($conf & 0x03) != 0;
return if $rate > 0x07;
return if $mid != 0x4d; # Maxim
- return if $cid != 0x01; # MAX6680/MAX6681
- return 8;
+ return 8 if $cid == 0x01; # MAX6680/MAX6681
}
if ($chip == 8) {
return if ($conf & 0x2a) != 0;
return if $rate > 0x09;
return if $mid != 0x5c; # Winbond
- return if $cid != 0x00; # W83L771W/G
- return 6;
+ return 6 $cid == 0x00; # W83L771W/G
}
if ($chip == 9) {
return if ($conf & 0x1B) != 0;
return if $rate > 0x0F;
return if $mid != 0x55; # Texas Instruments
- return if $cid != 0x11; # TMP401
- return 8;
+ return 8 if $cid == 0x11; # TMP401
}
if ($chip == 10) {
return if ($conf & 0x1B) != 0;