Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing braces.

Browse Source 
Fix logic error - check the data read from the chip against 0xff.
This commit is contained in:
jdc 2013-11-04 15:06:26 +00:00
parent aee6f54b76
commit 1f29035404
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/dev/i2c/lm87.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lm87.c,v 1.3 2013/10/26 18:28:15 jdc Exp $ */ /* $NetBSD: lm87.c,v 1.4 2013/11/04 15:06:26 jdc Exp $ */
/* $OpenBSD: lm87.c,v 1.20 2008/11/10 05:19:48 cnst Exp $ */ /* $OpenBSD: lm87.c,v 1.20 2008/11/10 05:19:48 cnst Exp $ */
/* /*
@ -18,7 +18,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lm87.c,v 1.3 2013/10/26 18:28:15 jdc Exp $"); __KERNEL_RCSID(0, "$NetBSD: lm87.c,v 1.4 2013/11/04 15:06:26 jdc Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -354,9 +354,10 @@ lmenv_refresh(struct sysmon_envsys *sme, envsys_data_t *edata)
case LMENV_INT_TEMP: case LMENV_INT_TEMP:
if (data == 0x80) if (data == 0x80)
edata->state = ENVSYS_SINVALID; edata->state = ENVSYS_SINVALID;
else else {
edata->value_cur = (int8_t)data * 1000000 + 273150000; edata->value_cur = (int8_t)data * 1000000 + 273150000;
edata->state = ENVSYS_SVALID; edata->state = ENVSYS_SVALID;
}
break; break;
case LMENV_FAN1: case LMENV_FAN1:
if (edata->units == ENVSYS_SVOLTS_DC) { if (edata->units == ENVSYS_SVOLTS_DC) {
@ -364,12 +365,17 @@ lmenv_refresh(struct sysmon_envsys *sme, envsys_data_t *edata)
edata->state = ENVSYS_SVALID; edata->state = ENVSYS_SVALID;
break; break;
} }
tmp = data * sc->sc_fan1_div; if (data == 0xff) {
if (tmp == 0 || tmp == 0xff)
edata->state = ENVSYS_SINVALID; edata->state = ENVSYS_SINVALID;
else break;
}
tmp = data * sc->sc_fan1_div;
if (tmp == 0)
edata->state = ENVSYS_SINVALID;
else {
edata->value_cur = 1350000 / tmp; edata->value_cur = 1350000 / tmp;
edata->state = ENVSYS_SVALID; edata->state = ENVSYS_SVALID;
}
break; break;
case LMENV_FAN2: case LMENV_FAN2:
if (edata->units == ENVSYS_SVOLTS_DC) { if (edata->units == ENVSYS_SVOLTS_DC) {
@ -377,12 +383,17 @@ lmenv_refresh(struct sysmon_envsys *sme, envsys_data_t *edata)
edata->state = ENVSYS_SVALID; edata->state = ENVSYS_SVALID;
break; break;
} }
tmp = data * sc->sc_fan2_div; if (data == 0xff) {
if (tmp == 0 || tmp == 0xff)
edata->state = ENVSYS_SINVALID; edata->state = ENVSYS_SINVALID;
else break;
}
tmp = data * sc->sc_fan2_div;
if (tmp == 0)
edata->state = ENVSYS_SINVALID;
else {
edata->value_cur = 1350000 / tmp; edata->value_cur = 1350000 / tmp;
edata->state = ENVSYS_SVALID; edata->state = ENVSYS_SVALID;
}
break; break;
default: default:
edata->state = ENVSYS_SINVALID; edata->state = ENVSYS_SINVALID;