Commit 0f8ead58 authored by David Laight's avatar David Laight Committed by Herbert Xu
Browse files

hwrng: core - use min3() instead of nested min_t() 



min_t(u16, a, b) is likely to discard significant bits.
Replace:
	min_t(u16, min_t(u16, default_quality, 1024), rng->quality ?: 1024);
with:
	min3(default_quality, 1024, rng->quality ?: 1024);

Signed-off-by: default avatarDavid Laight <david.laight.linux@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6c5d5b6d

drivers/char/hw_random/core.c

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ int hwrng_register(struct hwrng *rng) 
	init_completion(&rng->dying);



	/* Adjust quality field to always have a proper value */

	rng->quality = min_t(u16, min_t(u16, default_quality, 1024), rng->quality ?: 1024);

	rng->quality = min3(default_quality, 1024, rng->quality ?: 1024);



	if (!cur_rng_set_by_user &&

	    (!current_rng || rng->quality > current_rng->quality)) {