diff --git a/[refs] b/[refs]
index 92c813f7d125..99a240bd0437 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e88bdff1c65145f7ba297ccec69c774afe4c785
+refs/heads/master: 2dac8e54f988ab58525505d7ef982493374433c3
diff --git a/trunk/drivers/char/random.c b/trunk/drivers/char/random.c
index 30794779c523..9a2156d77629 100644
--- a/trunk/drivers/char/random.c
+++ b/trunk/drivers/char/random.c
@@ -975,7 +975,7 @@ static void init_std_data(struct entropy_store *r)
 
 	now = ktime_get_real();
 	mix_pool_bytes(r, &now, sizeof(now));
-	for (i = r->poolinfo->poolwords; i; i--) {
+	for (i = r->poolinfo->POOLBYTES; i > 0; i -= sizeof flags) {
 		if (!arch_get_random_long(&flags))
 			break;
 		mix_pool_bytes(r, &flags, sizeof(flags));