Skip to content

Commit 0f8ead5

Browse files
David Laightherbertx
authored andcommitted
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: David Laight <david.laight.linux@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
1 parent 6c5d5b6 commit 0f8ead5

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/char/hw_random/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ int hwrng_register(struct hwrng *rng)
545545
init_completion(&rng->dying);
546546

547547
/* Adjust quality field to always have a proper value */
548-
rng->quality = min_t(u16, min_t(u16, default_quality, 1024), rng->quality ?: 1024);
548+
rng->quality = min3(default_quality, 1024, rng->quality ?: 1024);
549549

550550
if (!cur_rng_set_by_user &&
551551
(!current_rng || rng->quality > current_rng->quality)) {

0 commit comments

Comments
 (0)