Module Name: src
Committed By: pgoyette
Date: Wed Jun 15 13:34:13 UTC 2011
Modified Files:
src/sys/dev/sysmon: sysmon_envsys.c
Log Message:
Previous fix broke the setting of current value for Indicator and
Battery-Charge sensors. Fix this.
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/sysmon/sysmon_envsys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.114 src/sys/dev/sysmon/sysmon_envsys.c:1.115
--- src/sys/dev/sysmon/sysmon_envsys.c:1.114 Wed Jun 8 18:22:24 2011
+++ src/sys/dev/sysmon/sysmon_envsys.c Wed Jun 15 13:34:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.114 2011/06/08 18:22:24 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.115 2011/06/15 13:34:13 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.114 2011/06/08 18:22:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.115 2011/06/15 13:34:13 pgoyette Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -1555,6 +1555,15 @@
if (error)
return (-error);
+ if (value_update) {
+ /*
+ * update sensor's current value.
+ */
+ error = sme_sensor_upint32(dict, "cur-value", edata->value_cur);
+ if (error)
+ return error;
+ }
+
/*
* Battery charge and Indicator types do not
* need the remaining objects, so skip them.
@@ -1573,13 +1582,6 @@
}
if (value_update) {
- /*
- * update sensor's current value.
- */
- error = sme_sensor_upint32(dict, "cur-value", edata->value_cur);
- if (error)
- return error;
-
/*
* update sensor's {max,min}-value.
*/
