 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_rndq.c,v 1.50 2015/04/14 12:28:12 riastradh Exp $	*/
+/*	$NetBSD: kern_rndq.c,v 1.51 2015/04/14 12:33:53 riastradh Exp $	*/
 /*-
  * Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Michael Graff <explorer@flame.org> and Thor Lancelot Simon.
  * This code uses ideas and algorithms from the Linux driver written by
  * Ted Ts'o.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.50 2015/04/14 12:28:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.51 2015/04/14 12:33:53 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/select.h>
 #include <sys/poll.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/systm.h>
 @@ -1010,27 +1010,27 @@ rnd_hwrng_test(rnd_sample_t *sample)
 	return 0;
+}
 /*
  * Process the events in the ring buffer.  Called by rnd_timeout or
  * by the add routines directly if the callout has never fired (that
  * is, if we are "cold" -- just booted).
+ *
  */
 static void
 rnd_process_events(void)
+{
 	rnd_sample_t *sample = NULL;
-	krndsource_t *source, *badsource = NULL;
+	krndsource_t *source;
 	static krndsource_t *last_source;
 	uint32_t entropy;
 	size_t pool_entropy;
 	int found = 0, wake = 0;
 	struct rnd_sampleq dq_samples = SIMPLEQ_HEAD_INITIALIZER(dq_samples);
 	struct rnd_sampleq df_samples = SIMPLEQ_HEAD_INITIALIZER(df_samples);
 	/*
 	 * Drain to the on-stack queue and drop the lock.
 	 */
 	mutex_spin_enter(&rnd_samples.lock);
 	while ((sample = SIMPLEQ_FIRST(&rnd_samples.q))) {
 		found++;
 @@ -1080,27 +1080,27 @@ rnd_process_events(void)
 		 */
 		if (source->flags & RND_FLAG_NO_COLLECT)
 			goto skip;
 		/*
 		 * Hardware generators are great but sometimes they
 		 * have...hardware issues.  Don't use any data from
 		 * them unless it passes some tests.
 		 */
 		if (source->type == RND_TYPE_RNG) {
 			if (__predict_false(rnd_hwrng_test(sample))) {
 				source->flags |= RND_FLAG_NO_COLLECT;
 				rnd_printf("rnd: disabling source \"%s\".",
-				    badsource->name);
+				    source->name);
 				goto skip;
+			}
+		}
 		if (source->flags & RND_FLAG_COLLECT_VALUE) {
 			rndpool_add_data(&rnd_pool, sample->values,
 					 sample_count *
 					     sizeof(sample->values[1]),
 );
+		}
 		if (source->flags & RND_FLAG_COLLECT_TIME) {
 			rndpool_add_data(&rnd_pool, sample->ts,
 					 sample_count *