diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-04-18 12:14:55 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 12:14:55 +0200 |
commit | 1111b680d34bc19190f02a1b4479c3fcc592c22e (patch) | |
tree | 9d45ad88b9354205a2d1fd76a338ab8693a16d86 /drivers/char/hw_random/bcm2835-rng.c | |
parent | 37b6cb475a6d74bc047c53bc323d6eb3113e27a4 (diff) | |
parent | 24223657806a0ebd0ae5c9caaf7b021091889cf2 (diff) |
Merge branch 'perf/urgent' into perf/core, to pick up PMU driver fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/char/hw_random/bcm2835-rng.c')
-rw-r--r-- | drivers/char/hw_random/bcm2835-rng.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c index 8c3b255e629a..e900961cdd2e 100644 --- a/drivers/char/hw_random/bcm2835-rng.c +++ b/drivers/char/hw_random/bcm2835-rng.c @@ -61,18 +61,18 @@ static int bcm2835_rng_probe(struct platform_device *pdev) } bcm2835_rng_ops.priv = (unsigned long)rng_base; + /* set warm-up count & enable */ + __raw_writel(RNG_WARMUP_COUNT, rng_base + RNG_STATUS); + __raw_writel(RNG_RBGEN, rng_base + RNG_CTRL); + /* register driver */ err = hwrng_register(&bcm2835_rng_ops); if (err) { dev_err(dev, "hwrng registration failed\n"); iounmap(rng_base); - } else { + } else dev_info(dev, "hwrng registered\n"); - /* set warm-up count & enable */ - __raw_writel(RNG_WARMUP_COUNT, rng_base + RNG_STATUS); - __raw_writel(RNG_RBGEN, rng_base + RNG_CTRL); - } return err; } |