diff options
| author | Linus Torvalds | 2014-04-15 01:04:14 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-04-15 01:04:14 +0200 |
| commit | dafe344d2288f0ebc0e3d4c6a5eb15bc82189c53 (patch) | |
| tree | 3bccc69ab1d228520094fe83bbc969e9a0a8b432 /drivers/char | |
| parent | user namespace: fix incorrect memory barriers (diff) | |
| parent | hwrng: bcm2835 - fix oops when rng h/w is accessed during registration (diff) | |
| download | kernel-qcow2-linux-dafe344d2288f0ebc0e3d4c6a5eb15bc82189c53.tar.gz kernel-qcow2-linux-dafe344d2288f0ebc0e3d4c6a5eb15bc82189c53.tar.xz kernel-qcow2-linux-dafe344d2288f0ebc0e3d4c6a5eb15bc82189c53.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull bmc2835 crypto fix from Herbert Xu:
"This fixes a potential boot crash on bcm2835 due to the recent change
that now causes hardware RNGs to be accessed on registration"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
hwrng: bcm2835 - fix oops when rng h/w is accessed during registration
Diffstat (limited to 'drivers/char')
| -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; } |