diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-18 12:20:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-18 12:20:36 -0700 |
| commit | 48d4e137ea3174dc77efe1cc20570e95af2ffc9e (patch) | |
| tree | e363b7141778c95bb4595477c869870954486007 /drivers/char/hw_random | |
| parent | 9023a4093d6594040fb8142cdd2615d3461caa7a (diff) | |
| parent | c475c06f4bb689d6ad87d7512e036d6dface3160 (diff) | |
| download | linux-3.10-48d4e137ea3174dc77efe1cc20570e95af2ffc9e.tar.gz linux-3.10-48d4e137ea3174dc77efe1cc20570e95af2ffc9e.tar.bz2 linux-3.10-48d4e137ea3174dc77efe1cc20570e95af2ffc9e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull a crypto fix from Herbert Xu:
"This push fixes another bug in the atmel-rng that made it produce
completely useless output."
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
hwrng: atmel-rng - fix data valid check
Diffstat (limited to 'drivers/char/hw_random')
| -rw-r--r-- | drivers/char/hw_random/atmel-rng.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c index 6289f0eee24..731c9046cf7 100644 --- a/drivers/char/hw_random/atmel-rng.c +++ b/drivers/char/hw_random/atmel-rng.c @@ -34,7 +34,7 @@ static int atmel_trng_read(struct hwrng *rng, void *buf, size_t max, u32 *data = buf; /* data ready? */ - if (readl(trng->base + TRNG_ODATA) & 1) { + if (readl(trng->base + TRNG_ISR) & 1) { *data = readl(trng->base + TRNG_ODATA); /* ensure data ready is only set again AFTER the next data |