summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorAndre Wolokita <andre.wolokita@analog.com>2015-03-16 12:54:50 +1100
committerHerbert Xu <herbert@gondor.apana.org.au>2015-03-17 22:32:05 +1100
commit656d7e7ee3f3dae71862054c0893546d261a1ee7 (patch)
tree1e4d44fd29e68592f7d7cc254c703a9c9f642007 /drivers/char
parent1a5addfe82d2778fc3651d1f8adbf5ea5b3b0560 (diff)
downloadlinux-656d7e7ee3f3dae71862054c0893546d261a1ee7.tar.gz
linux-656d7e7ee3f3dae71862054c0893546d261a1ee7.tar.bz2
linux-656d7e7ee3f3dae71862054c0893546d261a1ee7.zip
hwrng: omap - Change RNG_CONFIG_REG to RNG_CONTROL_REG in init
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 <Andre.Wolokita@analog.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/hw_random/omap-rng.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index 6af027463b53..8a1432e8bb80 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;