 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysmon_envsys.c,v 1.144 2019/03/26 15:50:23 bad Exp $	*/
+/*	$NetBSD: sysmon_envsys.c,v 1.144.4.1 2020/06/07 16:40:00 martin Exp $	*/
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -54,27 +54,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Environmental sensor framework for sysmon, exported to userland
  * with proplib(3).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.144 2019/03/26 15:50:23 bad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.144.4.1 2020/06/07 16:40:00 martin Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/errno.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
 #include <sys/rndsource.h>
 #include <sys/module.h>
 @@ -814,36 +814,26 @@ sysmon_envsys_register(struct sysmon_env
 	sysmon_envsys_next_sensor_index += sme->sme_nsensors;
 	mutex_exit(&sme_global_mtx);
 out:
 	/*
 	 * No errors?  Make an initial data refresh if was requested,
 	 * then register the events that were set in the driver.  Do
 	 * the refresh first in case it is needed to establish the
 	 * limits or max_value needed by some events.
 	 */
 	if (error == 0) {
 		nevent = 0;
 		if (sme->sme_flags & SME_INIT_REFRESH) {
 			sysmon_task_queue_sched(0, sme_initial_refresh, sme);
 			DPRINTF(("%s: scheduled initial refresh for '%s'\n",
 				__func__, sme->sme_name));
 		SLIST_FOREACH(evdv, &sme_evdrv_list, evdrv_head) {
 			sysmon_task_queue_sched(0,
 			    sme_event_drvadd, evdv->evdrv);
 			nevent++;
 		/*
 		 * Hook the sensor into rnd(4) entropy pool if requested
 		 */
 		TAILQ_FOREACH(edata, &sme->sme_sensors_list, sensors_head) {
 			if (edata->flags & ENVSYS_FHAS_ENTROPY) {
 				uint32_t rnd_type, rnd_flag = 0;
 				size_t n;
 				int tail = 1;
 				snprintf(rnd_name, sizeof(rnd_name), "%s-%s",
 				    sme->sme_name, edata->desc);
 				n = strlen(rnd_name);
 				/*
 @@ -879,26 +869,37 @@ out:
 				    case ENVSYS_SAMPHOUR:
 					rnd_type = RND_TYPE_POWER;
 					rnd_flag |= RND_FLAG_COLLECT_VALUE;
 					rnd_flag |= RND_FLAG_ESTIMATE_VALUE;
 					break;
 				    default:
 					rnd_type = RND_TYPE_UNKNOWN;
 					break;
+				}
 				rnd_attach_source(&edata->rnd_src, rnd_name,
 				    rnd_type, rnd_flag);
+			}
+		}
 		if (sme->sme_flags & SME_INIT_REFRESH) {
 			sysmon_task_queue_sched(0, sme_initial_refresh, sme);
 			DPRINTF(("%s: scheduled initial refresh for '%s'\n",
 				__func__, sme->sme_name));
+		}
 		SLIST_FOREACH(evdv, &sme_evdrv_list, evdrv_head) {
 			sysmon_task_queue_sched(0,
 			    sme_event_drvadd, evdv->evdrv);
 			nevent++;
+		}
 		DPRINTF(("%s: driver '%s' registered (nsens=%d nevent=%d)\n",
 		    __func__, sme->sme_name, sme->sme_nsensors, nevent));
+	}
 out2:
 	while (!SLIST_EMPTY(&sme_evdrv_list)) {
 		evdv = SLIST_FIRST(&sme_evdrv_list);
 		SLIST_REMOVE_HEAD(&sme_evdrv_list, evdrv_head);
 		kmem_free(evdv, sizeof(*evdv));
+	}
 	if (!error)
 		return 0;