From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andre Wolokita Subject: [PATCH v2] omap-rng: Change RNG_CONFIG_REG to RNG_CONTROL_REG in init Date: Fri, 20 Feb 2015 12:17:03 +1100 Message-ID: <54E68B0F.6030307@analog.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: To: Return-path: Received: from mail-bl2on0063.outbound.protection.outlook.com ([65.55.169.63]:14703 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752445AbbBTBS1 (ORCPT ); Thu, 19 Feb 2015 20:18:27 -0500 Sender: linux-crypto-owner@vger.kernel.org List-ID: omap4_rng_init() checks bit 10 of the RNG_CONFIG_REG to determine whether the RNG is already running before performing any initiliasation. This is not the correct register to check, as the enable bit is in RNG_CONFIG_CONTROL. Read from RNG_CONTROL_REG instead. Signed-off-by: Andre Wolokita --- drivers/char/hw_random/omap-rng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c index d14dcf7..ff74e5d 100644 --- a/drivers/char/hw_random/omap-rng.c +++ b/drivers/char/hw_random/omap-rng.c @@ -236,7 +236,7 @@ static int omap4_rng_init(struct omap_rng_dev *priv) u32 val; /* Return if RNG is already running. */ - if (omap_rng_read(priv, RNG_CONFIG_REG) & RNG_CONTROL_ENABLE_TRNG_MASK) + if (omap_rng_read(priv, RNG_CONTROL_REG) & RNG_CONTROL_ENABLE_TRNG_MASK) return 0; val = RNG_CONFIG_MIN_REFIL_CYCLES << RNG_CONFIG_MIN_REFIL_CYCLES_SHIFT; -- 1.7.9.5 -- Andre Wolokita (andre.wolokita@analog.com) Design Engineer, Analog Devices Australia Pty Ltd Unit 3, 97 Lewis Road, Wantirna, Victoria, 3152, AUSTRALIA Direct: +61 3 9881 9933 Main: +61 3 9881 9999 Fax: +61 3 9881 9988 Web: www.analog.com/au Embedded DSP software for multimedia & telecommunications. This communication is proprietary and confidential.