summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorJan Henrik Weinstock <jan.weinstock@rwth-aachen.de>2021-02-01 16:14:59 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-03 18:22:43 +0100
commitca30f70de83a89862340948dca9bcbe31b6a8632 (patch)
treedb13d7f009d1b84330b46e6eb1cf835839dc1349 /drivers/char
parent9ef8ddf400dd0ccf15f0b1d1605a22ee0c635bc6 (diff)
hwrng: timeriomem - Fix cooldown period calculation
[ Upstream commit e145f5565dc48ccaf4cb50b7cfc48777bed8c100 ] Ensure cooldown period tolerance of 1% is actually accounted for. Fixes: ca3bff70ab32 ("hwrng: timeriomem - Improve performance...") Signed-off-by: Jan Henrik Weinstock <jan.weinstock@rwth-aachen.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/hw_random/timeriomem-rng.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hw_random/timeriomem-rng.c b/drivers/char/hw_random/timeriomem-rng.c
index 03ff5483d865..1aa7e0b0ae0f 100644
--- a/drivers/char/hw_random/timeriomem-rng.c
+++ b/drivers/char/hw_random/timeriomem-rng.c
@@ -79,7 +79,7 @@ static int timeriomem_rng_read(struct hwrng *hwrng, void *data,
*/
if (retval > 0)
usleep_range(period_us,
- period_us + min(1, period_us / 100));
+ period_us + max(1, period_us / 100));
*(u32 *)data = readl(priv->io_base);
retval += sizeof(u32);