Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1883a484 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

hwrng: imx-rngc - fix the timeout for init and self check 



commit d744ae7477190967a3ddc289e2cd4ae59e8b1237 upstream.

Fix the timeout that is used for the initialisation and for the self
test. wait_for_completion_timeout expects a timeout in jiffies, but
RNGC_TIMEOUT is in milliseconds. Call msecs_to_jiffies to do the
conversion.

Cc: stable@vger.kernel.org
Fixes: 1d544944 ("hwrng: mx-rngc - add a driver for Freescale RNGC")
Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3373e6b

drivers/char/hw_random/imx-rngc.c

+2 −4
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int imx_rngc_self_test(struct imx_rngc *rngc) 
	cmd = readl(rngc->base + RNGC_COMMAND);

	writel(cmd | RNGC_CMD_SELF_TEST, rngc->base + RNGC_COMMAND);



	ret = wait_for_completion_timeout(&rngc->rng_op_done, RNGC_TIMEOUT);

	ret = wait_for_completion_timeout(&rngc->rng_op_done, msecs_to_jiffies(RNGC_TIMEOUT));

	if (!ret) {

		imx_rngc_irq_mask_clear(rngc);

		return -ETIMEDOUT;
@@ -182,9 +182,7 @@ static int imx_rngc_init(struct hwrng *rng) 
		cmd = readl(rngc->base + RNGC_COMMAND);

		writel(cmd | RNGC_CMD_SEED, rngc->base + RNGC_COMMAND);



		ret = wait_for_completion_timeout(&rngc->rng_op_done,

				RNGC_TIMEOUT);



		ret = wait_for_completion_timeout(&rngc->rng_op_done, msecs_to_jiffies(RNGC_TIMEOUT));

		if (!ret) {

			imx_rngc_irq_mask_clear(rngc);

			return -ETIMEDOUT;