Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

48d4e137 · Linus Torvalds <[email protected]> · 2012-06-18 12:20:36 -07:00

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

Commit: 48d4e137ea3174dc77efe1cc20570e95af2ffc9e
Parents: 9023a409 · c475c06f

Merge commit. Changes below are compared with the first parent: 9023a409.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/char/hw_random/atmel-rng.c	modified	+1	−1	View file

drivers/char/hw_random/atmel-rng.c

View file

diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c
index 6289f0e..731c904 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